1 files changed, 41 insertions, 41 deletions

diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp
index 4e8c1b00..f96d228a 100644
--- a/kstars/kstars/indi/apogee/ApnCamera.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera.cpp
@@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light )
 	unsigned short	TotalVPixels;
 
 
-	while ( read_ImagingStatus() != Apn_Status_Flushing )
+	while ( read_ImagingtqStatus() != Apn_Status_Flushing )
 	{
 		Sleep( 20 );
 	}
@@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light )
 		PostRoiRows	= 1;
 	}
 
-        // Set up the geometry for a full frame device
+        // Set up the tqgeometry for a full frame device
         if ( m_ApnSensorInfo->m_EnableSingleRowOffset )
         {
                 PreRoiVBinning  += PreRoiRows;
@@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV()
 
 double CApnCamera::read_InputVoltage()
 {
-	UpdateGeneralStatus();
+	UpdateGeneraltqStatus();
 
 	return m_pvtInputVoltage;
 }
@@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion()
 
 bool CApnCamera::read_ShutterState()
 {
-	UpdateGeneralStatus();
+	UpdateGeneraltqStatus();
 
 	return m_pvtShutterState;
 }
@@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution )
 	}
 }
 
-Apn_Status CApnCamera::read_ImagingStatus()
+Apn_tqStatus CApnCamera::read_ImagingtqStatus()
 {
 	bool Exposing, Active, Done, Flushing, WaitOnTrigger;
 	bool DataHalted, RamError;
 
 
-	UpdateGeneralStatus();
+	UpdateGeneraltqStatus();
 
-	// Update the ImagingStatus
+	// Update the ImagingtqStatus
 	Exposing		= false;
 	Active			= false;
 	Done			= false;
@@ -599,42 +599,42 @@ Apn_Status CApnCamera::read_ImagingStatus()
 
 	if ( RamError )
 	{
-		m_pvtImagingStatus = Apn_Status_PatternError;
+		m_pvtImagingtqStatus = Apn_Status_PatternError;
 	}
 	else
 	{
 		if ( DataHalted )
 		{
-			m_pvtImagingStatus = Apn_Status_DataError;
+			m_pvtImagingtqStatus = Apn_Status_DataError;
 		}
 		else
 		{
 			if ( WaitOnTrigger )
 			{
-				m_pvtImagingStatus = Apn_Status_WaitingOnTrigger;
+				m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger;
 			}
 			else
 			{
 				if ( Done && m_pvtImageInProgress )
 				{
 					m_pvtImageReady			= true;
-					m_pvtImagingStatus		= Apn_Status_ImageReady;
+					m_pvtImagingtqStatus		= Apn_Status_ImageReady;
 				}
 				else
 				{
 					if ( Active )
 					{
 						if ( Exposing )
-							m_pvtImagingStatus = Apn_Status_Exposing;
+							m_pvtImagingtqStatus = Apn_Status_Exposing;
 						else
-							m_pvtImagingStatus = Apn_Status_ImagingActive;
+							m_pvtImagingtqStatus = Apn_Status_ImagingActive;
 					}
 					else
 					{
 						if ( Flushing )
-							m_pvtImagingStatus = Apn_Status_Flushing;
+							m_pvtImagingtqStatus = Apn_Status_Flushing;
 						else
-							m_pvtImagingStatus = Apn_Status_Idle;
+							m_pvtImagingtqStatus = Apn_Status_Idle;
 					}
 				}
 			}
@@ -642,39 +642,39 @@ Apn_Status CApnCamera::read_ImagingStatus()
 	}
 
 	/*
-	switch( m_pvtImagingStatus )
+	switch( m_pvtImagingtqStatus )
 	{
 	case Apn_Status_DataError:
-		OutputDebugString( "ImagingStatus: Apn_Status_DataError" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_DataError" );
 		break;
 	case Apn_Status_PatternError:
-		OutputDebugString( "ImagingStatus: Apn_Status_PatternError" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_PatternError" );
 		break;
 	case Apn_Status_Idle:
-		OutputDebugString( "ImagingStatus: Apn_Status_Idle" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_Idle" );
 		break;
 	case Apn_Status_Exposing:
-		OutputDebugString( "ImagingStatus: Apn_Status_Exposing" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_Exposing" );
 		break;
 	case Apn_Status_ImagingActive:
-		OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_ImagingActive" );
 		break;
         case Apn_Status_ImageReady:
-                OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" );
+                OutputDebugString( "ImagingtqStatus: Apn_Status_ImageReady" );
                 break;
 	case Apn_Status_Flushing:
-		OutputDebugString( "ImagingStatus: Apn_Status_Flushing" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_Flushing" );
 		break;
 	case Apn_Status_WaitingOnTrigger:
-		OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" );
+		OutputDebugString( "ImagingtqStatus: Apn_Status_WaitingOnTrigger" );
 		break;
 	default:
-		OutputDebugString( "ImagingStatus: UNDEFINED!!" );
+		OutputDebugString( "ImagingtqStatus: UNDEFINED!!" );
 		break;
 	}
 	*/
 
-	return m_pvtImagingStatus;
+	return m_pvtImagingtqStatus;
 }
 
 Apn_LedMode CApnCamera::read_LedMode()
@@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable )
 	m_pvtCoolerEnable = CoolerEnable;
 }
 
-Apn_CoolerStatus CApnCamera::read_CoolerStatus()
+Apn_CoolertqStatus CApnCamera::read_CoolertqStatus()
 {
 	bool CoolerAtTemp;
 	bool CoolerActive;
 	bool CoolerTempRevised;
 
 
-	UpdateGeneralStatus();
+	UpdateGeneraltqStatus();
 
-	// Update CoolerStatus
+	// Update CoolertqStatus
 	CoolerActive		= false;
 	CoolerAtTemp		= false;
 	CoolerTempRevised	= false;
@@ -789,25 +789,25 @@ Apn_CoolerStatus CApnCamera::read_CoolerStatus()
 	// Now derive our cooler state
 	if ( !CoolerActive )
 	{
-		m_pvtCoolerStatus = Apn_CoolerStatus_Off;
+		m_pvtCoolertqStatus = Apn_CoolerStatus_Off;
 	}
 	else
 	{
 		if ( CoolerTempRevised )
 		{
-			m_pvtCoolerStatus = Apn_CoolerStatus_Revision;
+			m_pvtCoolertqStatus = Apn_CoolerStatus_Revision;
 		}
 		else
 		{
 			if ( CoolerAtTemp )
-				m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint;
+				m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint;
 			else
-				m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint;
+				m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint;
 
 		}
 	}
 
-	return m_pvtCoolerStatus;
+	return m_pvtCoolertqStatus;
 }
 
 double CApnCamera::read_CoolerSetPoint()
@@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint )
 
 double CApnCamera::read_CoolerDrive()
 {
-	UpdateGeneralStatus();
+	UpdateGeneraltqStatus();
 
 	return m_pvtCoolerDrive;
 }
 
 double CApnCamera::read_TempCCD()
 {
-	// UpdateGeneralStatus();
+	// UpdateGeneraltqStatus();
 
 	unsigned short	TempReg;
 	unsigned short	TempAvg;
@@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD()
 
 double CApnCamera::read_TempHeatsink()
 {
-	// UpdateGeneralStatus();
+	// UpdateGeneraltqStatus();
 
 	unsigned short	TempReg;
 	unsigned short	TempAvg;
@@ -1493,7 +1493,7 @@ long CApnCamera::InitDefaults()
 
 	unsigned short PreRoiRows, PostRoiRows;
 	unsigned short PreRoiVBinning, PostRoiVBinning;
-	unsigned short UnbinnedRoiY;		// Vertical ROI pixels
+	unsigned short UnbinnedRoiY;		//Qt::Vertical ROI pixels
 	
 
 	// Read the Camera ID register
@@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults()
 	Write( FPGA_REG_TEMP_RAMP_DOWN_A,	m_ApnSensorInfo->m_TempRampRateOne );
 	Write( FPGA_REG_TEMP_RAMP_DOWN_B,	m_ApnSensorInfo->m_TempRampRateTwo );
 	// the collor code not only determines the m_pvtCoolerEnable state, but
-	// also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus()
-	if ( read_CoolerStatus() == Apn_CoolerStatus_Off )
+	// also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus()
+	if ( read_CoolertqStatus() == Apn_CoolerStatus_Off )
 		m_pvtCoolerEnable = false;
 	else
 		m_pvtCoolerEnable = true;
@@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset()
 	return 0;
 }
 
-void CApnCamera::UpdateGeneralStatus()
+void CApnCamera::UpdateGeneraltqStatus()
 {
 	unsigned short	StatusReg;
 	unsigned short	HeatsinkTempReg;