summaryrefslogtreecommitdiffstats
path: root/krdc/vnc/threads.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'krdc/vnc/threads.cpp')
-rw-r--r--krdc/vnc/threads.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp
index f4e0eefe..097e1367 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::changetqStatus(RemoteViewtqStatus s) {
+void ControllerThread::changeStatus(RemoteViewStatus s) {
m_status = s;
TQApplication::postEvent(m_view, new StatusChangeEvent(s));
}
@@ -86,13 +86,13 @@ void ControllerThread::run() {
return;
}
if (m_quitFlag) {
- changetqStatus(REMOTE_VIEW_DISCONNECTED);
+ changeStatus(REMOTE_VIEW_DISCONNECTED);
return;
}
- changetqStatus(REMOTE_VIEW_AUTHENTICATING);
+ changeStatus(REMOTE_VIEW_AUTHENTICATING);
- enum InittqStatus s = InitialiseRFBConnection();
+ enum InitStatus 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)
- changetqStatus(REMOTE_VIEW_DISCONNECTED);
+ changeStatus(REMOTE_VIEW_DISCONNECTED);
else
sendFatalError(ERROR_INTERNAL);
return;
@@ -120,18 +120,18 @@ void ControllerThread::run() {
m_waiter.wait(1000);
if (m_quitFlag) {
- changetqStatus(REMOTE_VIEW_DISCONNECTED);
+ changeStatus(REMOTE_VIEW_DISCONNECTED);
return;
}
- changetqStatus(REMOTE_VIEW_PREPARING);
+ changeStatus(REMOTE_VIEW_PREPARING);
if (!SetFormatAndEncodings()) {
sendFatalError(ERROR_INTERNAL);
return;
}
- changetqStatus(REMOTE_VIEW_CONNECTED);
+ changeStatus(REMOTE_VIEW_CONNECTED);
m_wthread.start();
@@ -143,11 +143,11 @@ void ControllerThread::run() {
}
m_quitFlag = true;
- changetqStatus(REMOTE_VIEW_DISCONNECTED);
+ changeStatus(REMOTE_VIEW_DISCONNECTED);
m_wthread.kick();
}
-enum RemoteViewtqStatus ControllerThread::status() {
+enum RemoteViewStatus ControllerThread::status() {
return m_status;
}
@@ -185,7 +185,7 @@ bool WriterThread::sendIncrementalUpdateRequest() {
}
bool WriterThread::sendUpdateRequest(const TQRegion &region) {
- TQMemArray<TQRect> r = region.tqrects();
+ TQMemArray<TQRect> r = region.rects();
for (unsigned int i = 0; i < r.size(); i++)
if (!SendFramebufferUpdateRequest(r[i].x(),
r[i].y(),