Fix some kdeedu build issues

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236928 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 28 insertions, 28 deletions

diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index 1194d4bd..2c442d48 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -905,7 +905,7 @@ void DetailDialog::centerTelescope()
   int selectedCoord(0);
   SkyPoint sp;
   
-  // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element
+  // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
   // i.e. the first telescope we tqfind!
   
   INDIMenu *imenu = ksw->getINDIMenu();
@@ -917,10 +917,10 @@ void DetailDialog::centerTelescope()
     {
        indidev = imenu->mgr.at(i)->indi_dev.at(j);
        indidev->stdDev->currentObject = NULL;
-       prop = indidev->findProp("ETQUATORIAL_EOD_COORD");
+       prop = indidev->findProp("EQUATORIAL_EOD_COORD");
        	if (prop == NULL)
 	{
-		  prop = indidev->findProp("ETQUATORIAL_COORD");
+		  prop = indidev->findProp("EQUATORIAL_COORD");
 		  if (prop == NULL)
                   {
                     prop = indidev->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp
index b400dbcb..a9857df3 100644
--- a/kstars/kstars/indi/apmount.cpp
+++ b/kstars/kstars/indi/apmount.cpp
@@ -231,7 +231,7 @@ void APMount::initProperties()
 
    fillNumber(&EqN[0], "RA", "RA  H:M:S", "%10.6m",  0., 24., 0., 0.);
    fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.);
-   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
+   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
 
    fillNumber(&GeoN[0], "LAT",  "Lat.  D:M:S +N", "%10.6m",  -90.,  90., 0., 0.);
    fillNumber(&GeoN[1], "LONG", "Long. D:M:S +E", "%10.6m", 0., 360., 0., 0.);
diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp
index e25c95ac..5eb7fe81 100644
--- a/kstars/kstars/indi/celestrongps.cpp
+++ b/kstars/kstars/indi/celestrongps.cpp
@@ -65,7 +65,7 @@ static INumber eq[] = {
 };
 //TODO decide appropiate TIME_OUT
 static INumberVectorProperty eqNum = {
-    mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
+    mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
     eq, NARRAY(eq), "", 0};
 
 /* Fundamental group */
diff --git a/kstars/kstars/indi/lx200basic.cpp b/kstars/kstars/indi/lx200basic.cpp
index 1d41e652..a812caa6 100644
--- a/kstars/kstars/indi/lx200basic.cpp
+++ b/kstars/kstars/indi/lx200basic.cpp
@@ -165,7 +165,7 @@ void LX200Basic::initProperties()
 
    fillNumber(&EqN[0], "RA", "RA  H:M:S", "%10.6m",  0., 24., 0., 0.);
    fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.);
-   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
+   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
 
    
 }
diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp
index d498ba62..afe1b952 100644
--- a/kstars/kstars/indi/lx200generic.cpp
+++ b/kstars/kstars/indi/lx200generic.cpp
@@ -118,7 +118,7 @@ INumber eq[] = {
 //TODO decide appropiate TIME_OUT
 // N.B. No Static identifier as it is needed for external linkage
 INumberVectorProperty eqNum = {
-    mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
+    mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
     eq, NARRAY(eq), "", 0};
 
 /* Fundamental group */
diff --git a/kstars/kstars/indi/temmadriver.h b/kstars/kstars/indi/temmadriver.h
index 8bd2ccc1..79926c3f 100644
--- a/kstars/kstars/indi/temmadriver.h
+++ b/kstars/kstars/indi/temmadriver.h
@@ -172,14 +172,14 @@ static ITextVectorProperty Port		= {
 	IP_RW, 0, IPS_OK, PortT, NARRAY(PortT), "", 0};
 
 /*******************************/
-/* ETQUATORIAL_COORD RW property */
+/* EQUATORIAL_COORD RW property */
 /*******************************/
 static INumber eq[] = {
 	{"RA"		,"RA H:M:S" , "%10.6m", 0, 24, 0, 0, 0, 0, 0},	
 	{"DEC", "Dec D:M:S", "%10.6m", -90, 90, 0, 0, 0, 0, 0}
 };
 static INumberVectorProperty eqNum = { 
-	mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", 
+	mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", 
 	MAIN_GROUP , IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0};
 
 /*******************************/
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index 02c6f8f1..9d724b56 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -81,7 +81,7 @@
 /* INDI standard property used across all clients to enable interoperability. */
 
 const char * indi_std[NINDI_STD] = 
-  {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "ETQUATORIAL_COORD", "ETQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" };
+  {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "EQUATORIAL_COORD", "EQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" };
 
 /*******************************************************************
 ** INDI Device: The work-horse. Responsible for handling its
diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h
index a7f10f08..09571062 100644
--- a/kstars/kstars/indielement.h
+++ b/kstars/kstars/indielement.h
@@ -49,7 +49,7 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_NUMERIC, PG_BUTTONS,
 /* INDI std properties */
 /* N.B. Need to modify corresponding entry in indidevice.cpp when changed */    
 enum stdProperties { CONNECTION, DEVICE_PORT, TIME, SDTIME, GEOGRAPHIC_COORD,   /* General */
-                     ETQUATORIAL_COORD, ETQUATORIAL_EOD_COORD, HORIZONTAL_COORD,  /* Telescope */
+                     EQUATORIAL_COORD, EQUATORIAL_EOD_COORD, HORIZONTAL_COORD,  /* Telescope */
                      ABORT_MOTION, ON_COORD_SET, SOLAR_SYSTEM, MOVEMENT, PARK,  /* Telescope */
                      CCD_EXPOSE_DURATION, CCD_TEMPERATURE, CCD_FRAME,           /* CCD */
                      CCD_FRAME_TYPE, CCD_BINNING, CCD_INFO, CCDPREVIEW_STREAM,  /* CCD */
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index 4ad0c4d6..f01551c7 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -301,8 +301,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
 	 CCDPreviewWindow->setCCDInfo(fwhm, mu);
 	 break;
 
-       case ETQUATORIAL_COORD:
-       case ETQUATORIAL_EOD_COORD:
+       case EQUATORIAL_COORD:
+       case EQUATORIAL_EOD_COORD:
 	if (!dp->isOn()) break;
 	el = pp->findElement("RA");
 	if (!el) return;
@@ -742,11 +742,11 @@ void INDIStdDevice::timerDone()
         return;
        }
 	
-       prop = dp->findProp("ETQUATORIAL_EOD_COORD");
+       prop = dp->findProp("EQUATORIAL_EOD_COORD");
        
        if (prop == NULL)
        {
-         prop = dp->findProp("ETQUATORIAL_COORD");
+         prop = dp->findProp("EQUATORIAL_COORD");
 	 if (prop) useJ2000 = true;
        }
        
@@ -862,10 +862,10 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN
    	if (stdDev->devTimer->isActive())
 		 	stdDev->devTimer->stop();
 
-   	prop = pp->pg->dp->findProp("ETQUATORIAL_EOD_COORD");
+   	prop = pp->pg->dp->findProp("EQUATORIAL_EOD_COORD");
        	if (prop == NULL)
 	{
-		  prop = pp->pg->dp->findProp("ETQUATORIAL_COORD");
+		  prop = pp->pg->dp->findProp("EQUATORIAL_COORD");
 		  if (prop == NULL)
                   {
                     prop = pp->pg->dp->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index 9ff1e72c..8a5ce618 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -654,7 +654,7 @@ void KStars::setINDITargetCoord(TQString deviceName, double RA, double DEC)
     return;
   }
   
-  prop = dev->findProp("ETQUATORIAL_EOD_COORD");
+  prop = dev->findProp("EQUATORIAL_EOD_COORD");
   if (!prop) return;
   
   el   = prop->findElement("RA");
@@ -698,7 +698,7 @@ void KStars::setINDITargetName(TQString deviceName, TQString objectName)
     return;
   }
   
-  prop = dev->findProp("ETQUATORIAL_EOD_COORD");
+  prop = dev->findProp("EQUATORIAL_EOD_COORD");
   if (!prop) return;
   
   el   = prop->findElement("RA");
diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp
index 81c575b4..d6c515fc 100644
--- a/kstars/kstars/skymapdraw.cpp
+++ b/kstars/kstars/skymapdraw.cpp
@@ -166,11 +166,11 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) {
 					 if (portConnect->state == PS_BUSY)
 					  return;
 
-					eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_EOD_COORD");
+					eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_EOD_COORD");
 					
 					if (eqNum == NULL)
 					{
-						eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_COORD");
+						eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_COORD");
 						if (eqNum == NULL)
                                                 {
 						  eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h
index 2480f9cd..eac67f51 100644
--- a/kstars/kstars/tools/modcalcequinox.h
+++ b/kstars/kstars/tools/modcalcequinox.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef MODCALCETQUINOX_H
-#define MODCALCETQUINOX_H
+#ifndef MODCALCEQUINOX_H
+#define MODCALCEQUINOX_H
 
 #include <kapplication.h>
 #include <tqwidget.h>
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index 163040b9..67e0ad74 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -345,7 +345,7 @@ void ObservingList::slotSlewToObject()
   int selectedCoord(0);
   SkyPoint sp;
   
-  // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element
+  // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
   // i.e. the first telescope we tqfind!
   
   INDIMenu *imenu = ks->getINDIMenu();
@@ -357,10 +357,10 @@ void ObservingList::slotSlewToObject()
     {
        indidev = imenu->mgr.at(i)->indi_dev.at(j);
        indidev->stdDev->currentObject = NULL;
-       prop = indidev->findProp("ETQUATORIAL_EOD_COORD");
+       prop = indidev->findProp("EQUATORIAL_EOD_COORD");
        	if (prop == NULL)
 	{
-		  prop = indidev->findProp("ETQUATORIAL_COORD");
+		  prop = indidev->findProp("EQUATORIAL_COORD");
 		  if (prop == NULL)
                   {
                     prop = indidev->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 31667d00..471e50c9 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -166,11 +166,11 @@ ScriptBuilder::ScriptBuilder( TQWidget *tqparent, const char *name )
 	INDIFunctionList.append( setINDIScopeActionFunc);
 	
 	setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates.  RA is expressed in Hours; DEC is expressed in Degrees." ), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "RA", "double", "DEC" );
-	setINDITargetCoordFunc->setINDIProperty("ETQUATORIAL_EOD_COORD");
+	setINDITargetCoordFunc->setINDIProperty("EQUATORIAL_EOD_COORD");
 	INDIFunctionList.append ( setINDITargetCoordFunc );
 	
 	setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "objectName");
-	setINDITargetNameFunc->setINDIProperty("ETQUATORIAL_EOD_COORD");
+	setINDITargetNameFunc->setINDIProperty("EQUATORIAL_EOD_COORD");
 	INDIFunctionList.append( setINDITargetNameFunc);
 	
 	setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "long", "double", "lat");