From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:40 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- krdc/vnc/desktop.c | 2 +- krdc/vnc/kvncview.cpp | 18 +++++++++--------- krdc/vnc/kvncview.h | 2 +- krdc/vnc/rfbproto.c | 8 ++++---- krdc/vnc/rfbproto.h | 12 ++++++------ krdc/vnc/threads.cpp | 22 +++++++++++----------- krdc/vnc/threads.h | 6 +++--- krdc/vnc/vnchostpref.cpp | 2 +- krdc/vnc/vncprefs.ui | 4 ++-- krdc/vnc/vnctypes.h | 2 +- krdc/vnc/vncviewer.h | 2 +- 11 files changed, 40 insertions(+), 40 deletions(-) (limited to 'krdc/vnc') diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c index 003a7160..73b2e423 100644 --- a/krdc/vnc/desktop.c +++ b/krdc/vnc/desktop.c @@ -626,7 +626,7 @@ void SyncScreenRegionX11Thread(int x, int y, int width, int height) { } /* - * ToplevelInitBeforeRealization sets the title, tqgeometry and other resources + * ToplevelInitBeforeRealization sets the title, geometry and other resources * on the toplevel window. */ diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 02cd3a78..b7a3b8bf 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ KVncView::KVncView(TQWidget *parent, setFixedSize(16,16); setFocusPolicy(TQ_StrongFocus); - m_cb = TQApplication::tqclipboard(); + m_cb = TQApplication::clipboard(); connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); @@ -219,7 +219,7 @@ bool KVncView::checkLocalKRfb() { if (m_port != portNum) return true; - settqStatus(REMOTE_VIEW_DISCONNECTED); + setStatus(REMOTE_VIEW_DISCONNECTED); KMessageBox::error(0, i18n("It is not possible to connect to a local desktop sharing service."), i18n("Connection Failure")); @@ -236,7 +236,7 @@ bool KVncView::editPreferences( HostPrefPtr host ) // show preferences dialog KDialogBase *dlg = new KDialogBase( 0L, "dlg", true, - i18n( "VNC Host Preferences for %1" ).tqarg( host->host() ), + i18n( "VNC Host Preferences for %1" ).arg( host->host() ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); TQVBox *vbox = dlg->makeVBoxMainWidget(); @@ -295,7 +295,7 @@ bool KVncView::start() { useKWallet = hp->useKWallet(); } - settqStatus(REMOTE_VIEW_CONNECTING); + setStatus(REMOTE_VIEW_CONNECTING); m_cthread.start(); setBackgroundMode(TQt::NoBackground); @@ -390,7 +390,7 @@ void KVncView::customEvent(TQCustomEvent *e) } else if (e->type() == StatusChangeEventType) { StatusChangeEvent *sce = (StatusChangeEvent*) e; - settqStatus(sce->status()); + setStatus(sce->status()); if (m_status == REMOTE_VIEW_CONNECTED) { emit connected(); setFocus(); @@ -458,7 +458,7 @@ void KVncView::customEvent(TQCustomEvent *e) } else if (e->type() == FatalErrorEventType) { FatalErrorEvent *fee = (FatalErrorEvent*) e; - settqStatus(REMOTE_VIEW_DISCONNECTED); + setStatus(REMOTE_VIEW_DISCONNECTED); switch (fee->errorCode()) { case ERROR_CONNECTION: KMessageBox::error(0, @@ -683,8 +683,8 @@ void KVncView::focusOutEvent(TQFocusEvent *) { unpressModifiers(); } -TQSize KVncView::tqsizeHint() { - return tqmaximumSize(); +TQSize KVncView::sizeHint() { + return maximumSize(); } void KVncView::setRemoteMouseTracking(bool s) { diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h index 7fdf402c..7a8c9a2c 100644 --- a/krdc/vnc/kvncview.h +++ b/krdc/vnc/kvncview.h @@ -84,7 +84,7 @@ public: DotCursorState dotCursorState = DOT_CURSOR_AUTO, const TQString &encodings = TQString()); ~KVncView(); - TQSize tqsizeHint(); + TQSize sizeHint(); void drawRegion(int x, int y, int w, int h); void lockFramebuffer(); void unlockFramebuffer(); diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c index 13676bb6..8424e6ac 100644 --- a/krdc/vnc/rfbproto.c +++ b/krdc/vnc/rfbproto.c @@ -159,7 +159,7 @@ ConnectToRFBServer(const char *hostname, int port) * InitialiseRFBConnection. */ -enum InittqStatus +enum InitStatus InitialiseRFBConnection() { rfbProtocolVersionMsg pv; @@ -734,12 +734,12 @@ static void *MakeSoftCursor(int bpp, int cursorWidth, int cursorHeight, /********************************************************************* - * HandletqCursorShape(). Support for XCursor and RichCursor tqshape + * HandleCursorShape(). Support for XCursor and RichCursor shape * updates. We emulate cursor operating on the frame buffer (that is * why we call it "software cursor"). ********************************************************************/ -static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD32 enc) +static Bool HandleCursorShape(int xhot, int yhot, int width, int height, CARD32 enc) { int bytesPerPixel; size_t bytesPerRow, bytesMaskData; @@ -956,7 +956,7 @@ HandleRFBServerMessage() if (rect.encoding == rfbEncodingXCursor || rect.encoding == rfbEncodingRichCursor) { - if (!HandletqCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h, + if (!HandleCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h, rect.encoding)) { return False; } diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h index 1b5fd839..f08fe66a 100644 --- a/krdc/vnc/rfbproto.h +++ b/krdc/vnc/rfbproto.h @@ -27,7 +27,7 @@ * * All multiple byte integers are in big endian (network) order (most * significant byte first). Unless noted otherwise there is no special - * tqalignment of protocol structures. + * alignment of protocol structures. * * * Once the initial handshaking is done, all messages start with a type byte, @@ -54,7 +54,7 @@ /*----------------------------------------------------------------------------- * Structure used to specify a rectangle. This structure is a multiple of 4 * bytes so that it can be interspersed with 32-bit pixel data without - * affecting tqalignment. + * affecting alignment. */ typedef struct { @@ -299,7 +299,7 @@ typedef struct { /* * Special encoding numbers: * 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels; - * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data; + * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data; * 0xFFFFFF20 .. 0xFFFFFF2F -- various protocol extensions; * 0xFFFFFF30 .. 0xFFFFFFDF -- not allocated yet; * 0xFFFFFFE0 .. 0xFFFFFFEF -- quality level for JPEG compressor; @@ -350,7 +350,7 @@ typedef struct { * This message consists of a header giving the number of rectangles of pixel * data followed by the rectangles themselves. The header is padded so that * together with the type byte it is an exact multiple of 4 bytes (to help - * with tqalignment of 32-bit pixels): + * with alignment of 32-bit pixels): */ typedef struct { @@ -633,7 +633,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * XCursor encoding. This is a special encoding used to transmit X-style - * cursor tqshapes from server to clients. Note that for this encoding, + * cursor shapes from server to clients. Note that for this encoding, * coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot * position (r.x, r.y) and cursor size (r.w, r.h). If (w * h != 0), two RGB * samples are sent after header in the rfbXCursorColors structure. They @@ -664,7 +664,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * RichCursor encoding. This is a special encoding used to transmit cursor - * tqshapes from server to clients. It is similar to the XCursor encoding but + * shapes from server to clients. It is similar to the XCursor encoding but * uses client pixel format instead of two RGB colors to represent cursor * image. For this encoding, coordinates in rfbFramebufferUpdateRectHeader * structure hold hotspot position (r.x, r.y) and cursor size (r.w, r.h). 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 ®ion) { - TQMemArray r = region.tqrects(); + TQMemArray r = region.rects(); for (unsigned int i = 0; i < r.size(); i++) if (!SendFramebufferUpdateRequest(r[i].x(), r[i].y(), diff --git a/krdc/vnc/threads.h b/krdc/vnc/threads.h index 4bb77ef3..08ca4c20 100644 --- a/krdc/vnc/threads.h +++ b/krdc/vnc/threads.h @@ -102,18 +102,18 @@ protected: class ControllerThread : public TQThread { private: KVncView *m_view; - enum RemoteViewtqStatus m_status; + enum RemoteViewStatus m_status; WriterThread &m_wthread; volatile bool &m_quitFlag; volatile bool m_desktopInitialized; TQWaitCondition m_waiter; - void changetqStatus(RemoteViewtqStatus s); + void changeStatus(RemoteViewStatus s); void sendFatalError(ErrorCode s); public: ControllerThread(KVncView *v, WriterThread &wt, volatile bool &quitFlag); - enum RemoteViewtqStatus status(); + enum RemoteViewStatus status(); void desktopInit(); void kick(); diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp index 3ae6ed92..7fea2889 100644 --- a/krdc/vnc/vnchostpref.cpp +++ b/krdc/vnc/vnchostpref.cpp @@ -96,7 +96,7 @@ TQString VncHostPref::prefDescription() const { Q_ASSERT(true); } return i18n("Show Preferences: %1, Quality: %2, KWallet: %3") - .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(q).tqarg(m_useKWallet ? i18n("yes") : i18n("no")); + .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(q).arg(m_useKWallet ? i18n("yes") : i18n("no")); } void VncHostPref::setQuality(int q) { diff --git a/krdc/vnc/vncprefs.ui b/krdc/vnc/vncprefs.ui index f569bb3f..ad38431c 100644 --- a/krdc/vnc/vncprefs.ui +++ b/krdc/vnc/vncprefs.ui @@ -104,7 +104,7 @@ 0 - + 280 0 @@ -124,7 +124,7 @@ Expanding - + 84 16 diff --git a/krdc/vnc/vnctypes.h b/krdc/vnc/vnctypes.h index 4dba9a5c..fae12549 100644 --- a/krdc/vnc/vnctypes.h +++ b/krdc/vnc/vnctypes.h @@ -54,7 +54,7 @@ typedef struct { } AppData; -enum InittqStatus { +enum InitStatus { INIT_OK = 0, INIT_NAME_RESOLUTION_FAILURE = 1, INIT_PROTOCOL_FAILURE = 2, diff --git a/krdc/vnc/vncviewer.h b/krdc/vnc/vncviewer.h index 4b1f6cb9..285357b9 100644 --- a/krdc/vnc/vncviewer.h +++ b/krdc/vnc/vncviewer.h @@ -155,7 +155,7 @@ typedef struct { extern PointerImage pointerImages[]; extern int ConnectToRFBServer(const char *hostname, int port); -extern enum InittqStatus InitialiseRFBConnection(void); +extern enum InitStatus InitialiseRFBConnection(void); extern Bool SetFormatAndEncodings(void); extern Bool SendIncrementalFramebufferUpdateRequest(void); extern Bool SendFramebufferUpdateRequest(int x, int y, int w, int h, -- cgit v1.2.1