From 805c2821ceaddada48b346c6d11bd0dc1351a539 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:33:07 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 src/modules/my/idle.cpp     | 10 +++++-----
 src/modules/my/idle_mac.cpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/modules/my')

diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp
index daa5c209..0917aec7 100644
--- a/src/modules/my/idle.cpp
+++ b/src/modules/my/idle.cpp
@@ -72,12 +72,12 @@ bool Idle::usingPlatform() const
 
 void Idle::start()
 {
-	d->startTime = TQDateTime::tqcurrentDateTime();
+	d->startTime = TQDateTime::currentDateTime();
 
 	if(!platform) {
 		// generic idle
 		d->lastMousePos = TQCursor::pos();
-		d->idleSince = TQDateTime::tqcurrentDateTime();
+		d->idleSince = TQDateTime::currentDateTime();
 	}
 
 	// poll every second (use a lower value if you need more accuracy)
@@ -96,7 +96,7 @@ int Idle::secondsIdle()
 		i = platform->secondsIdle();
 	else {
 		TQPoint curMousePos = TQCursor::pos();
-		TQDateTime curDateTime = TQDateTime::tqcurrentDateTime();
+		TQDateTime curDateTime = TQDateTime::currentDateTime();
 		if(d->lastMousePos != curMousePos) {
 			d->lastMousePos = curMousePos;
 			d->idleSince = curDateTime;
@@ -105,7 +105,7 @@ int Idle::secondsIdle()
 	}
 
 	// set 'beginIdle' to the beginning of the idle time (by backtracking 'i' seconds from now)
-	TQDateTime beginIdle = TQDateTime::tqcurrentDateTime().addSecs(-i);
+	TQDateTime beginIdle = TQDateTime::currentDateTime().addSecs(-i);
 
 	// set 't' to hold the number of seconds between 'beginIdle' and 'startTime'
 	int t = beginIdle.secsTo(d->startTime);
@@ -121,7 +121,7 @@ int Idle::secondsIdle()
 	}
 
 	// how long have we been idle?
-	int idleTime = d->startTime.secsTo(TQDateTime::tqcurrentDateTime());
+	int idleTime = d->startTime.secsTo(TQDateTime::currentDateTime());
 	return idleTime;
 }
 
diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp
index 4e116fa9..92de564d 100644
--- a/src/modules/my/idle_mac.cpp
+++ b/src/modules/my/idle_mac.cpp
@@ -24,8 +24,8 @@
 #include <Carbon/Carbon.h>
 
 // Why does Apple have to make this so complicated?
-static OStqStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
-	OStqStatus  err;
+static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
+	OSStatus  err;
 	FSRef   frameworksFolderRef;
 	CFURLRef baseURL;
 	CFURLRef bundleURL;
@@ -117,7 +117,7 @@ IdlePlatform::~IdlePlatform() {
 
 
 // Typedef for the function we're getting back from CFBundleGetFunctionPointerForName.
-typedef OStqStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
+typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
 																 EventTimerInterval   inFireDelay,
 																 EventTimerInterval   inInterval,
 																 EventLoopIdleTimerUPP    inTimerProc,
-- 
cgit v1.2.1