diff options
Diffstat (limited to 'krdc')
| -rw-r--r-- | krdc/krdc.h | 2 | ||||
| -rw-r--r-- | krdc/kremoteview.h | 8 | ||||
| -rw-r--r-- | krdc/main.cpp | 8 | ||||
| -rw-r--r-- | krdc/vnc/kvncview.cpp | 14 | ||||
| -rw-r--r-- | krdc/vnc/kvncview.h | 2 | ||||
| -rw-r--r-- | krdc/vnc/threads.cpp | 12 |
6 files changed, 23 insertions, 23 deletions
diff --git a/krdc/krdc.h b/krdc/krdc.h index 17949297..58724b61 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -132,7 +132,7 @@ protected: public: KRDC(WindowMode wm = WINDOW_MODE_AUTO, const TQString &host = TQString(), - Quality q = TQUALITY_UNKNOWN, + Quality q = QUALITY_UNKNOWN, const TQString &encodings = TQString(), const TQString &password = TQString(), bool scale = false, diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h index 5869ea0e..aca3105e 100644 --- a/krdc/kremoteview.h +++ b/krdc/kremoteview.h @@ -24,10 +24,10 @@ #include "events.h" typedef enum { - TQUALITY_UNKNOWN=0, - TQUALITY_HIGH=1, - TQUALITY_MEDIUM=2, - TQUALITY_LOW=3 + QUALITY_UNKNOWN=0, + QUALITY_HIGH=1, + QUALITY_MEDIUM=2, + QUALITY_LOW=3 } Quality; /** diff --git a/krdc/main.cpp b/krdc/main.cpp index 6d80d741..e808b6fb 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) KApplication a; TQString host = TQString(); - Quality quality = TQUALITY_UNKNOWN; + Quality quality = QUALITY_UNKNOWN; TQString encodings = TQString(); TQString password = TQString(); TQString resolution = TQString(); @@ -111,11 +111,11 @@ int main(int argc, char *argv[]) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->isSet("low-quality")) - quality = TQUALITY_LOW; + quality = QUALITY_LOW; else if (args->isSet("medium-quality")) - quality = TQUALITY_MEDIUM; + quality = QUALITY_MEDIUM; else if (args->isSet("high-quality")) - quality = TQUALITY_HIGH; + quality = QUALITY_HIGH; if (args->isSet("fullscreen")) wm = WINDOW_MODE_FULLSCREEN; diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 6f4066e6..c332afbd 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -103,7 +103,7 @@ KVncView::KVncView(TQWidget *parent, "pics/pointcursormask.png")); m_cursor = TQCursor(cursorBitmap, cursorMask); - if ((quality != TQUALITY_UNKNOWN) || + if ((quality != QUALITY_UNKNOWN) || !encodings.isNull()) configureApp(quality, encodings); } @@ -160,21 +160,21 @@ void KVncView::configureApp(Quality q, const TQString specialEncodings) { appData.shareDesktop = 1; appData.viewOnly = 0; - if (q == TQUALITY_LOW) { + if (q == QUALITY_LOW) { appData.useBGR233 = 1; appData.encodingsString = "background copyrect softcursor tight zlib hextile raw"; appData.compressLevel = -1; appData.qualityLevel = 1; appData.dotCursor = 1; } - else if (q == TQUALITY_MEDIUM) { + else if (q == QUALITY_MEDIUM) { appData.useBGR233 = 0; appData.encodingsString = "background copyrect softcursor tight zlib hextile raw"; appData.compressLevel = -1; appData.qualityLevel = 7; appData.dotCursor = 1; } - else if ((q == TQUALITY_HIGH) || (q == TQUALITY_UNKNOWN)) { + else if ((q == QUALITY_HIGH) || (q == QUALITY_UNKNOWN)) { appData.useBGR233 = 0; appData.encodingsString = "copyrect softcursor hextile raw"; appData.compressLevel = -1; @@ -281,11 +281,11 @@ bool KVncView::start() { Quality quality; if (ci == 0) - quality = TQUALITY_HIGH; + quality = QUALITY_HIGH; else if (ci == 1) - quality = TQUALITY_MEDIUM; + quality = QUALITY_MEDIUM; else if (ci == 2) - quality = TQUALITY_LOW; + quality = QUALITY_LOW; else { kdDebug() << "Unknown quality"; return false; diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h index c2c137b6..daaf30b1 100644 --- a/krdc/vnc/kvncview.h +++ b/krdc/vnc/kvncview.h @@ -80,7 +80,7 @@ public: KVncView(TQWidget* parent=0, const char *name=0, const TQString &host = TQString(""), int port = 5900, const TQString &password = TQString(), - Quality quality = TQUALITY_UNKNOWN, + Quality quality = QUALITY_UNKNOWN, DotCursorState dotCursorState = DOT_CURSOR_AUTO, const TQString &encodings = TQString()); ~KVncView(); diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp index 097e1367..cb33b46c 100644 --- a/krdc/vnc/threads.cpp +++ b/krdc/vnc/threads.cpp @@ -33,9 +33,9 @@ static const int MAXIMUM_WAIT_PERIOD = 8000; // time to postpone incremental updates that have not been requested explicitly static const int POSTPONED_INCRRTQ_WAIT_PERIOD = 110; -static const int MOUSEPRESS_TQUEUE_SIZE = 5; -static const int MOUSEMOVE_TQUEUE_SIZE = 3; -static const int KEY_TQUEUE_SIZE = 8192; +static const int MOUSEPRESS_QUEUE_SIZE = 5; +static const int MOUSEMOVE_QUEUE_SIZE = 3; +static const int KEY_QUEUE_SIZE = 8192; ControllerThread::ControllerThread(KVncView *v, WriterThread &wt, volatile bool &quitFlag) : @@ -246,12 +246,12 @@ void WriterThread::queueMouseEvent(int x, int y, int buttonMask) { m_lock.unlock(); return; } - if (m_mouseEventNum >= MOUSEPRESS_TQUEUE_SIZE) { + if (m_mouseEventNum >= MOUSEPRESS_QUEUE_SIZE) { m_lock.unlock(); return; } if ((m_lastMouseEvent.buttons == buttonMask) && - (m_mouseEventNum >= MOUSEMOVE_TQUEUE_SIZE)) { + (m_mouseEventNum >= MOUSEMOVE_QUEUE_SIZE)) { m_lock.unlock(); return; } @@ -272,7 +272,7 @@ void WriterThread::queueKeyEvent(unsigned int k, bool down) { e.e.k.down = down; m_lock.lock(); - if (m_keyEventNum >= KEY_TQUEUE_SIZE) { + if (m_keyEventNum >= KEY_QUEUE_SIZE) { m_lock.unlock(); return; } |