diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:01 -0600 |
| commit | 32a249baaef1b910bffd79734c78cac3671f00f2 (patch) | |
| tree | 07233b57d529ba723ec8d157152dada5b9cf8380 /src/modules/my | |
| parent | c6611272c2bc4a42580848946c8c5d81bb0409c7 (diff) | |
| download | kvirc-32a249baaef1b910bffd79734c78cac3671f00f2.tar.gz kvirc-32a249baaef1b910bffd79734c78cac3671f00f2.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/modules/my')
| -rw-r--r-- | src/modules/my/idle.cpp | 10 | ||||
| -rw-r--r-- | src/modules/my/idle_mac.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
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, |