TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 17 insertions, 17 deletions

diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index e7a36efc..02c6f8f1 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -8,7 +8,7 @@
     version 2 of the License, or (at your option) any later version.
 
     JM Changelog:
-    2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/Qt
+    2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/TQt
     2003-05-01 Added tab for devices and a group feature
     2003-05-02 Added scrolling area. Most things are rewritten
     2003-05-05 Device/Group seperation
@@ -81,18 +81,18 @@
 /* INDI standard property used across all clients to enable interoperability. */
 
 const char * indi_std[NINDI_STD] = 
-  {"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" };
+  {"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" };
 
 /*******************************************************************
 ** INDI Device: The work-horse. Responsible for handling its
 ** child properties and managing signal and changes.
 *******************************************************************/
-INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inName, TQString inLabel) 
+INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *tqparentManager, TQString inName, TQString inLabel) 
 {
   name      = inName;
   label     = inLabel;
-  parent    = menuParent;
-  parentMgr = parentManager;
+  tqparent    = menuParent;
+  tqparentMgr = tqparentManager;
   
   gl.setAutoDelete(true);
 
@@ -105,7 +105,7 @@ INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inNa
 
  dataBuffer = (unsigned char *) malloc (1);
  
- stdDev 	= new INDIStdDevice(this, parent->ksw);
+ stdDev 	= new INDIStdDevice(this, tqparent->ksw);
 
  curGroup       = NULL;
 
@@ -183,7 +183,7 @@ int INDI_D::setAnyCmd (XMLEle *root, char errmsg[])
 	    return (-1);
 	}
 
-	parentMgr->checkMsg (root, this);
+	tqparentMgr->checkMsg (root, this);
 
 	return (setValue (pp, root, errmsg));
 }
@@ -344,7 +344,7 @@ int INDI_D::setTextValue (INDI_P *pp, XMLEle *root, char errmsg[])
 }
 
 /* set the given BUTTONS or LIGHTS property from the given element.
- * root should have some <switch> or <light> children.
+ * root should have some <switch> or <light> tqchildren.
  * return 0 if ok else -1 with reason in errmsg
  */
 int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[])
@@ -521,7 +521,7 @@ int INDI_D::processBlob(INDI_E *blobEL, XMLEle *ep, char errmsg[])
     return (-1);
   }
   
-  iscomp = (dataFormat.find(".z") != -1);
+  iscomp = (dataFormat.tqfind(".z") != -1);
   
   dataFormat.remove(".z");
   
@@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[])
 	    return NULL;
 	}
 
-	/* Remove Vertical spacer from group layout, this is done everytime
+	/* RemoveQt::Vertical spacer from group tqlayout, this is done everytime
 	  * a new property arrives. The spacer is then appended to the end of the 
 	  * properties */
 	pg->propertyLayout->removeItem(pg->VerticalSpacer);
@@ -634,7 +634,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[])
 	pp->timeout = ap ? atof(valuXMLAtt(ap)) : 0;
 
 	/* log any messages */
-	parentMgr->checkMsg (root, this);
+	tqparentMgr->checkMsg (root, this);
 
 	pp->addGUI(root);
 
@@ -679,7 +679,7 @@ INDI_G *  INDI_D::findGroup (TQString grouptag, int create, char errmsg[])
 }
 
 
-/* find "perm" attribute in root, crack and set *pp.
+/* tqfind "perm" attribute in root, crack and set *pp.
  * return 0 if ok else -1 with excuse in errmsg[]
  */
 
@@ -775,7 +775,7 @@ int INDI_D::buildTextGUI(XMLEle *root, char errmsg[])
 	if (pp == NULL)
 	    return (-1);
 
-	/* get the permission, it will determine layout issues */
+	/* get the permission, it will determine tqlayout issues */
 	if (findPerm (pp, root, &p, errmsg))
 	{
 	    delete(pp);
@@ -811,7 +811,7 @@ int INDI_D::buildNumberGUI (XMLEle *root, char *errmsg)
 	if (pp == NULL)
 	    return (-1);
 
-	/* get the permission, it will determine layout issues */
+	/* get the permission, it will determine tqlayout issues */
 	if (findPerm (pp, root, &p, errmsg))
 	{
 	    delete(pp);
@@ -879,7 +879,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[])
 		return (err);
 	    }
 
-	    /* otherwise, build 1-4 button layout */
+	    /* otherwise, build 1-4 button tqlayout */
 	    pp->guitype = PG_BUTTONS;
 	    
 	    err = pp->buildSwitchesGUI(root, errmsg);
@@ -896,7 +896,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[])
 	}
 	else if (!strcmp (valuXMLAtt(ap), "AnyOfMany"))
 	{
-	    /* 1-4 checkboxes layout */
+	    /* 1-4 checkboxes tqlayout */
 	    pp->guitype = PG_RADIO;
 	    
 	    err = pp->buildSwitchesGUI(root, errmsg);
@@ -955,7 +955,7 @@ int INDI_D::buildBLOBGUI  (XMLEle *root, char errmsg[])
   if (!pp)
     return (-1);
 
-  /* get the permission, it will determine layout issues */
+  /* get the permission, it will determine tqlayout issues */
   if (findPerm (pp, root, &p, errmsg))
   {
     delete(pp);