1 files changed, 19 insertions, 19 deletions

diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index 0cea610..9f661cd 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -155,7 +155,7 @@ void DeviceCommThread::reset()
 	// Timer already deleted by close() call.
 	startOpenTimer(this,fOpenTimer);
 
-	link()->fLinktqStatus = WaitingForDevice;
+	link()->fLinkStatus = WaitingForDevice;
 }
 
 /**
@@ -176,9 +176,9 @@ void DeviceCommThread::openDevice()
 	// This transition (from Waiting to Found) can only be
 	// taken once.
 	//
-	if (link()->fLinktqStatus == WaitingForDevice)
+	if (link()->fLinkStatus == WaitingForDevice)
 	{
-		link()->fLinktqStatus = FoundDevice;
+		link()->fLinkStatus = FoundDevice;
 	}
 
 	if (link()->fMessages->shouldPrint(Messages::OpenMessage))
@@ -244,7 +244,7 @@ bool DeviceCommThread::open(const TQString &device)
 			<< link()->fRealPilotPath << "] already connected." << endl;
 		WARNINGKPILOT << msg << endl;
 
-		link()->fLinktqStatus = PilotLinkError;
+		link()->fLinkStatus = PilotLinkError;
 
 		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
 
@@ -263,7 +263,7 @@ bool DeviceCommThread::open(const TQString &device)
 		DEBUGKPILOT << msg << endl;
 		DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
 
-		link()->fLinktqStatus = PilotLinkError;
+		link()->fLinkStatus = PilotLinkError;
 
 		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
 
@@ -272,7 +272,7 @@ bool DeviceCommThread::open(const TQString &device)
 
 	DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl;
 
-	link()->fLinktqStatus = CreatedSocket;
+	link()->fLinkStatus = CreatedSocket;
 
 	DEBUGKPILOT << fname << ": Binding to path: ["
 		<< link()->fRealPilotPath << "]" << endl;
@@ -291,7 +291,7 @@ bool DeviceCommThread::open(const TQString &device)
 		DEBUGKPILOT << msg << endl;
 		DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
 
-		link()->fLinktqStatus = PilotLinkError;
+		link()->fLinkStatus = PilotLinkError;
 
 		if (link()->fMessages->shouldPrint(Messages::OpenFailMessage))
 		{
@@ -301,7 +301,7 @@ bool DeviceCommThread::open(const TQString &device)
 		return false;
 	}
 
-	link()->fLinktqStatus = DeviceOpen;
+	link()->fLinkStatus = DeviceOpen;
 	DeviceMap::self()->bindDevice(link()->fRealPilotPath);
 
 	fSocketNotifier = new TQSocketNotifier(fTempSocket,
@@ -411,16 +411,16 @@ void DeviceCommThread::acceptDevice()
 		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
 				.tqarg(TQString::fromLocal8Bit(s))));
 
-		link()->fLinktqStatus = PilotLinkError;
+		link()->fLinkStatus = PilotLinkError;
 		reset();
 		return;
 	}
 
 	DEBUGKPILOT << fname << ": Link accept done." << endl;
 
-	if ((link()->fLinktqStatus != DeviceOpen) || (fPilotSocket == -1))
+	if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1))
 	{
-		link()->fLinktqStatus = PilotLinkError;
+		link()->fLinkStatus = PilotLinkError;
 		WARNINGKPILOT << "Already connected or unable to connect!" << endl;
 
 		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
@@ -440,7 +440,7 @@ void DeviceCommThread::acceptDevice()
 		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
 				i18n("Unable to read system information from Pilot")));
 
-		link()->fLinktqStatus=PilotLinkError;
+		link()->fLinkStatus=PilotLinkError;
 		reset();
 		return;
 	}
@@ -488,7 +488,7 @@ void DeviceCommThread::acceptDevice()
 						"Perhaps you have a password set on the device?")));
 
 	}
-	link()->fLinktqStatus = AcceptedDevice;
+	link()->fLinkStatus = AcceptedDevice;
 
 	TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 100));
 
@@ -529,7 +529,7 @@ void DeviceCommThread::run()
 
 KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name,
 		const TQString &tempDevice) :
-	KPilotLink(parent, name), fLinktqStatus(Init), fWorkaroundUSB(false),
+	KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false),
 			fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L)
 {
 	FUNCTIONSETUP;
@@ -550,7 +550,7 @@ KPilotDeviceLink::~KPilotDeviceLink()
 
 /* virtual */bool KPilotDeviceLink::isConnected() const
 {
-	return fLinktqStatus == AcceptedDevice;
+	return fLinkStatus == AcceptedDevice;
 }
 
 /* virtual */bool KPilotDeviceLink::event(TQEvent *e)
@@ -640,7 +640,7 @@ void KPilotDeviceLink::reset(const TQString & dP)
 {
 	FUNCTIONSETUP;
 
-	fLinktqStatus = Init;
+	fLinkStatus = Init;
 
 	// Release all resources
 	//
@@ -670,7 +670,7 @@ void KPilotDeviceLink::startCommThread()
 		TQString msg = i18n("The Pilot device is not configured yet.");
 		WARNINGKPILOT << msg << endl;
 
-		fLinktqStatus = PilotLinkError;
+		fLinkStatus = PilotLinkError;
 
 		emit logError(msg);
 		return;
@@ -689,7 +689,7 @@ void KPilotDeviceLink::reset()
 
 	checkDevice();
 
-	fLinktqStatus = WaitingForDevice;
+	fLinkStatus = WaitingForDevice;
 
 	startCommThread();
 }
@@ -788,7 +788,7 @@ int KPilotDeviceLink::openConduit()
 	return dlp_OpenConduit(fPilotSocket);
 }
 
-TQString KPilotDeviceLink::statusString(LinktqStatus l)
+TQString KPilotDeviceLink::statusString(LinkStatus l)
 {
 	TQString s= CSL1("KPilotDeviceLink=");