diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
| commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
| tree | 591f1dc22278addb439726c42896376b17bb42bd /krdc/vnc/threads.cpp | |
| parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
| download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'krdc/vnc/threads.cpp')
| -rw-r--r-- | krdc/vnc/threads.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp index 097e1367..f4e0eefe 100644 --- a/krdc/vnc/threads.cpp +++ b/krdc/vnc/threads.cpp @@ -47,7 +47,7 @@ ControllerThread::ControllerThread(KVncView *v, WriterThread &wt, volatile bool { } -void ControllerThread::changeStatus(RemoteViewStatus s) { +void ControllerThread::changetqStatus(RemoteViewtqStatus s) { m_status = s; TQApplication::postEvent(m_view, new StatusChangeEvent(s)); } @@ -86,13 +86,13 @@ void ControllerThread::run() { return; } if (m_quitFlag) { - changeStatus(REMOTE_VIEW_DISCONNECTED); + changetqStatus(REMOTE_VIEW_DISCONNECTED); return; } - changeStatus(REMOTE_VIEW_AUTHENTICATING); + changetqStatus(REMOTE_VIEW_AUTHENTICATING); - enum InitStatus s = InitialiseRFBConnection(); + enum InittqStatus s = InitialiseRFBConnection(); if (s != INIT_OK) { if (s == INIT_CONNECTION_FAILED) sendFatalError(ERROR_IO); @@ -103,7 +103,7 @@ void ControllerThread::run() { else if (s == INIT_AUTHENTICATION_FAILED) sendFatalError(ERROR_AUTHENTICATION); else if (s == INIT_ABORTED) - changeStatus(REMOTE_VIEW_DISCONNECTED); + changetqStatus(REMOTE_VIEW_DISCONNECTED); else sendFatalError(ERROR_INTERNAL); return; @@ -120,18 +120,18 @@ void ControllerThread::run() { m_waiter.wait(1000); if (m_quitFlag) { - changeStatus(REMOTE_VIEW_DISCONNECTED); + changetqStatus(REMOTE_VIEW_DISCONNECTED); return; } - changeStatus(REMOTE_VIEW_PREPARING); + changetqStatus(REMOTE_VIEW_PREPARING); if (!SetFormatAndEncodings()) { sendFatalError(ERROR_INTERNAL); return; } - changeStatus(REMOTE_VIEW_CONNECTED); + changetqStatus(REMOTE_VIEW_CONNECTED); m_wthread.start(); @@ -143,11 +143,11 @@ void ControllerThread::run() { } m_quitFlag = true; - changeStatus(REMOTE_VIEW_DISCONNECTED); + changetqStatus(REMOTE_VIEW_DISCONNECTED); m_wthread.kick(); } -enum RemoteViewStatus ControllerThread::status() { +enum RemoteViewtqStatus ControllerThread::status() { return m_status; } @@ -185,7 +185,7 @@ bool WriterThread::sendIncrementalUpdateRequest() { } bool WriterThread::sendUpdateRequest(const TQRegion ®ion) { - TQMemArray<TQRect> r = region.rects(); + TQMemArray<TQRect> r = region.tqrects(); for (unsigned int i = 0; i < r.size(); i++) if (!SendFramebufferUpdateRequest(r[i].x(), r[i].y(), |