summaryrefslogtreecommitdiffstats
path: root/src/modules/my
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:20 -0600
commitc6611272c2bc4a42580848946c8c5d81bb0409c7 (patch)
tree0fd5b58844663dfcd00fb2b79cf67dd0fd429c62 /src/modules/my
parent805c2821ceaddada48b346c6d11bd0dc1351a539 (diff)
downloadkvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.tar.gz
kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
Diffstat (limited to 'src/modules/my')
-rw-r--r--src/modules/my/idle.cpp10
-rw-r--r--src/modules/my/idle_mac.cpp6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp
index 0917aec..daa5c20 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::currentDateTime();
+ d->startTime = TQDateTime::tqcurrentDateTime();
if(!platform) {
// generic idle
d->lastMousePos = TQCursor::pos();
- d->idleSince = TQDateTime::currentDateTime();
+ d->idleSince = TQDateTime::tqcurrentDateTime();
}
// 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::currentDateTime();
+ TQDateTime curDateTime = TQDateTime::tqcurrentDateTime();
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::currentDateTime().addSecs(-i);
+ TQDateTime beginIdle = TQDateTime::tqcurrentDateTime().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::currentDateTime());
+ int idleTime = d->startTime.secsTo(TQDateTime::tqcurrentDateTime());
return idleTime;
}
diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp
index 92de564..4e116fa 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 OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
- OSStatus err;
+static OStqStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
+ OStqStatus err;
FSRef frameworksFolderRef;
CFURLRef baseURL;
CFURLRef bundleURL;
@@ -117,7 +117,7 @@ IdlePlatform::~IdlePlatform() {
// Typedef for the function we're getting back from CFBundleGetFunctionPointerForName.
-typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
+typedef OStqStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
EventTimerInterval inFireDelay,
EventTimerInterval inInterval,
EventLoopIdleTimerUPP inTimerProc,