summaryrefslogtreecommitdiffstats
path: root/krdc
diff options
context:
space:
mode:
Diffstat (limited to 'krdc')
-rw-r--r--krdc/keycapturedialog.cpp4
-rw-r--r--krdc/keycapturedialog.h2
-rw-r--r--krdc/kfullscreenpanel.cpp4
-rw-r--r--krdc/kfullscreenpanel.h2
-rw-r--r--krdc/krdc.cpp4
-rw-r--r--krdc/krdc.h2
-rw-r--r--krdc/kremoteview.cpp4
-rw-r--r--krdc/kremoteview.h4
-rw-r--r--krdc/kservicelocator.cpp20
-rw-r--r--krdc/maindialog.cpp4
-rw-r--r--krdc/maindialog.h2
-rw-r--r--krdc/maindialogwidget.cpp4
-rw-r--r--krdc/maindialogwidget.h2
-rw-r--r--krdc/preferencesdialog.cpp4
-rw-r--r--krdc/preferencesdialog.h2
-rw-r--r--krdc/rdp/krdpview.cpp8
-rw-r--r--krdc/rdp/krdpview.h4
-rw-r--r--krdc/rdp/rdesktop.patch2
-rw-r--r--krdc/vnc/desktop.c18
-rw-r--r--krdc/vnc/kvncview.cpp6
-rw-r--r--krdc/vnc/kvncview.h2
-rw-r--r--krdc/vnc/rfbproto.c8
-rw-r--r--krdc/vnc/rfbproto.h12
23 files changed, 62 insertions, 62 deletions
diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp
index 7f394e40..fdbae624 100644
--- a/krdc/keycapturedialog.cpp
+++ b/krdc/keycapturedialog.cpp
@@ -46,8 +46,8 @@ const int XKeyRelease = KeyRelease;
#endif
-KeyCaptureDialog::KeyCaptureDialog(TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n( "Enter Key Combination" ),
+KeyCaptureDialog::KeyCaptureDialog(TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n( "Enter Key Combination" ),
Cancel, Cancel, true), m_grabbed(false) {
TQFrame *main = makeMainWidget();
TQVBoxLayout *tqlayout = new TQVBoxLayout( main, 0, KDialog::spacingHint() );
diff --git a/krdc/keycapturedialog.h b/krdc/keycapturedialog.h
index 5ee4c8d0..ee7a0153 100644
--- a/krdc/keycapturedialog.h
+++ b/krdc/keycapturedialog.h
@@ -33,7 +33,7 @@ class KeyCaptureDialog : public KDialogBase {
bool m_grabbed;
public:
- KeyCaptureDialog(TQWidget * tqparent= 0, const char *name = 0);
+ KeyCaptureDialog(TQWidget * parent= 0, const char *name = 0);
~KeyCaptureDialog();
public slots:
diff --git a/krdc/kfullscreenpanel.cpp b/krdc/kfullscreenpanel.cpp
index a43cc96d..81cd49e7 100644
--- a/krdc/kfullscreenpanel.cpp
+++ b/krdc/kfullscreenpanel.cpp
@@ -54,10 +54,10 @@ void Counter::timeout() {
}
-KFullscreenPanel::KFullscreenPanel(TQWidget* tqparent,
+KFullscreenPanel::KFullscreenPanel(TQWidget* parent,
const char *name,
const TQSize &resolution) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
m_child(0),
m_layout(0),
m_fsResolution(resolution),
diff --git a/krdc/kfullscreenpanel.h b/krdc/kfullscreenpanel.h
index 4d714959..d6e28927 100644
--- a/krdc/kfullscreenpanel.h
+++ b/krdc/kfullscreenpanel.h
@@ -57,7 +57,7 @@ private:
void doLayout();
public:
- KFullscreenPanel(TQWidget* tqparent, const char *name,
+ KFullscreenPanel(TQWidget* parent, const char *name,
const TQSize &resolution);
~KFullscreenPanel();
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index e6384ccd..e77079db 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -385,8 +385,8 @@ TQSize KRDC::tqsizeHint()
return m_view->framebufferSize();
}
-TQPopupMenu *KRDC::createPopupMenu(TQWidget *tqparent) const {
- KPopupMenu *pu = new KPopupMenu(tqparent);
+TQPopupMenu *KRDC::createPopupMenu(TQWidget *parent) const {
+ KPopupMenu *pu = new KPopupMenu(parent);
pu->insertItem(i18n("View Only"), this, TQT_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID);
pu->setCheckable(true);
pu->setItemChecked(VIEW_ONLY_ID, m_view->viewOnly());
diff --git a/krdc/krdc.h b/krdc/krdc.h
index 1cd5b739..d78dc959 100644
--- a/krdc/krdc.h
+++ b/krdc/krdc.h
@@ -121,7 +121,7 @@ private:
static const int TOOLBAR_SPEED_DOWN;
static const int TOOLBAR_SPEED_UP;
void fsToolbarScheduleHidden();
- TQPopupMenu *createPopupMenu(TQWidget *tqparent) const;
+ TQPopupMenu *createPopupMenu(TQWidget *parent) const;
protected:
virtual void mouseMoveEvent(TQMouseEvent *e);
diff --git a/krdc/kremoteview.cpp b/krdc/kremoteview.cpp
index cd887299..a3dbce40 100644
--- a/krdc/kremoteview.cpp
+++ b/krdc/kremoteview.cpp
@@ -17,10 +17,10 @@
#include "kremoteview.h"
-KRemoteView::KRemoteView(TQWidget *tqparent,
+KRemoteView::KRemoteView(TQWidget *parent,
const char *name,
WFlags f) :
- TQWidget(tqparent, name, f),
+ TQWidget(parent, name, f),
m_status(REMOTE_VIEW_DISCONNECTED) {
}
diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h
index 6aa68151..0b0ae11c 100644
--- a/krdc/kremoteview.h
+++ b/krdc/kremoteview.h
@@ -66,7 +66,7 @@ class KRemoteView : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- KRemoteView(TQWidget *tqparent = 0,
+ KRemoteView(TQWidget *parent = 0,
const char *name = 0,
WFlags f = 0);
@@ -266,7 +266,7 @@ signals:
* Emitted when the mouse on the remote side has been moved.
* @param x the new x coordinate
* @param y the new y coordinate
- * @param buttonMask the tqmask of mouse buttons (bit 0 for first mouse
+ * @param buttonMask the mask of mouse buttons (bit 0 for first mouse
* button, 1 for second button etc)a
*/
void mouseStateChanged(int x, int y, int buttonMask);
diff --git a/krdc/kservicelocator.cpp b/krdc/kservicelocator.cpp
index a14a4dc7..b7f58816 100644
--- a/krdc/kservicelocator.cpp
+++ b/krdc/kservicelocator.cpp
@@ -297,19 +297,19 @@ class AsyncThread : public TQThread {
protected:
SLPHandle m_handle;
KServiceLocatorPrivate *m_parent;
- AsyncThread(SLPHandle handle, KServiceLocatorPrivate *tqparent) :
+ AsyncThread(SLPHandle handle, KServiceLocatorPrivate *parent) :
m_handle(handle),
- m_parent(tqparent) {
+ m_parent(parent) {
}
};
class FindSrvTypesThread : public AsyncThread {
TQString m_namingAuthority, m_scopeList;
public:
FindSrvTypesThread(SLPHandle handle,
- KServiceLocatorPrivate *tqparent,
+ KServiceLocatorPrivate *parent,
const char *namingAuthority,
const char *scopeList) :
- AsyncThread(handle, tqparent),
+ AsyncThread(handle, parent),
m_namingAuthority(namingAuthority),
m_scopeList(scopeList){
}
@@ -330,11 +330,11 @@ class FindSrvsThread : public AsyncThread {
TQString m_srvUrl, m_scopeList, m_filter;
public:
FindSrvsThread(SLPHandle handle,
- KServiceLocatorPrivate *tqparent,
+ KServiceLocatorPrivate *parent,
const char *srvUrl,
const char *scopeList,
const char *filter) :
- AsyncThread(handle, tqparent),
+ AsyncThread(handle, parent),
m_srvUrl(srvUrl),
m_scopeList(scopeList),
m_filter(filter) {
@@ -358,11 +358,11 @@ class FindAttrsThread : public AsyncThread {
TQString m_srvUrl, m_scopeList, m_attrIds;
public:
FindAttrsThread(SLPHandle handle,
- KServiceLocatorPrivate *tqparent,
+ KServiceLocatorPrivate *parent,
const char *srvUrl,
const char *scopeList,
const char *attrIds) :
- AsyncThread(handle, tqparent),
+ AsyncThread(handle, parent),
m_srvUrl(srvUrl),
m_scopeList(scopeList),
m_attrIds(attrIds) {
@@ -384,8 +384,8 @@ public:
class FindScopesThread : public AsyncThread {
public:
FindScopesThread(SLPHandle handle,
- KServiceLocatorPrivate *tqparent) :
- AsyncThread(handle, tqparent){
+ KServiceLocatorPrivate *parent) :
+ AsyncThread(handle, parent){
}
virtual void run() {
SLPError e;
diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp
index 2e052200..c6d559a5 100644
--- a/krdc/maindialog.cpp
+++ b/krdc/maindialog.cpp
@@ -25,8 +25,8 @@
#include <kguiitem.h>
#include <klocale.h>
-MainDialog::MainDialog( TQWidget *tqparent, const char *name )
- : KDialogBase( tqparent, name, true, i18n( "Remote Desktop Connection" ),
+MainDialog::MainDialog( TQWidget *parent, const char *name )
+ : KDialogBase( parent, name, true, i18n( "Remote Desktop Connection" ),
Ok|Close|Help|User1, Ok, true, KGuiItem( i18n( "&Preferences" ),
"configure" ) )
{
diff --git a/krdc/maindialog.h b/krdc/maindialog.h
index 240dc8b2..03900ed9 100644
--- a/krdc/maindialog.h
+++ b/krdc/maindialog.h
@@ -29,7 +29,7 @@ class MainDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- MainDialog( TQWidget *tqparent, const char *name=0 );
+ MainDialog( TQWidget *parent, const char *name=0 );
~MainDialog() {}
void setRemoteHost( const TQString & );
diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp
index a76e31d1..eed72b99 100644
--- a/krdc/maindialogwidget.cpp
+++ b/krdc/maindialogwidget.cpp
@@ -77,8 +77,8 @@ class UrlListViewItem : public KListViewItem
TQString m_serviceid;
};
-MainDialogWidget::MainDialogWidget( TQWidget *tqparent, const char *name )
- : MainDialogBase( tqparent, name ),
+MainDialogWidget::MainDialogWidget( TQWidget *parent, const char *name )
+ : MainDialogBase( parent, name ),
m_scanning( false )
{
HostPreferences *hp = HostPreferences::instance();
diff --git a/krdc/maindialogwidget.h b/krdc/maindialogwidget.h
index 254cb755..5241bee6 100644
--- a/krdc/maindialogwidget.h
+++ b/krdc/maindialogwidget.h
@@ -33,7 +33,7 @@ class MainDialogWidget : public MainDialogBase
TQ_OBJECT
public:
- MainDialogWidget( TQWidget *tqparent, const char *name );
+ MainDialogWidget( TQWidget *parent, const char *name );
~MainDialogWidget();
void setRemoteHost( const TQString & );
diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp
index 3129abf6..ab302434 100644
--- a/krdc/preferencesdialog.cpp
+++ b/krdc/preferencesdialog.cpp
@@ -32,9 +32,9 @@
#include <klistview.h>
#include <klocale.h>
-PreferencesDialog::PreferencesDialog( TQWidget *tqparent, const char *name )
+PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name )
: KDialogBase( Tabbed, i18n( "Preferences" ), Ok|Cancel, Ok,
- tqparent, name, true )
+ parent, name, true )
{
TQVBox *page;
TQWidget *spacer;
diff --git a/krdc/preferencesdialog.h b/krdc/preferencesdialog.h
index fa927a39..947d38c0 100644
--- a/krdc/preferencesdialog.h
+++ b/krdc/preferencesdialog.h
@@ -36,7 +36,7 @@ class PreferencesDialog : public KDialogBase
TQ_OBJECT
public:
- PreferencesDialog( TQWidget *tqparent, const char *name=0 );
+ PreferencesDialog( TQWidget *parent, const char *name=0 );
~PreferencesDialog() {};
protected slots:
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 4462cca3..4e5bc632 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -45,8 +45,8 @@ extern KWallet::Wallet *wallet;
static KRdpView *krdpview;
-RdpContainer::RdpContainer(TQWidget *tqparent, const char *name, WFlags f) :
- QXEmbed(tqparent, name, f),
+RdpContainer::RdpContainer(TQWidget *parent, const char *name, WFlags f) :
+ QXEmbed(parent, name, f),
m_viewOnly(false)
{
}
@@ -82,12 +82,12 @@ bool RdpContainer::x11Event(XEvent *e)
// constructor
-KRdpView::KRdpView(TQWidget *tqparent, const char *name,
+KRdpView::KRdpView(TQWidget *parent, const char *name,
const TQString &host, int port,
const TQString &user, const TQString &password,
int flags, const TQString &domain,
const TQString &shell, const TQString &directory) :
- KRemoteView(tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents),
+ KRemoteView(parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents),
m_name(name),
m_host(host),
m_port(port),
diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h
index c0df50e7..c34d3c27 100644
--- a/krdc/rdp/krdpview.h
+++ b/krdc/rdp/krdpview.h
@@ -39,7 +39,7 @@ class RdpContainer : public QXEmbed
friend class KRdpView;
public:
- RdpContainer(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
+ RdpContainer(TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
~RdpContainer();
signals:
@@ -60,7 +60,7 @@ class KRdpView : public KRemoteView
public:
// constructor and destructor
- KRdpView(TQWidget *tqparent = 0, const char *name = 0,
+ KRdpView(TQWidget *parent = 0, const char *name = 0,
const TQString &host = TQString(), int port = TCP_PORT_RDP,
const TQString &user = TQString(), const TQString &password = TQString(),
int flags = RDP_LOGON_NORMAL, const TQString &domain = TQString(),
diff --git a/krdc/rdp/rdesktop.patch b/krdc/rdp/rdesktop.patch
index 954d5fc2..a027799c 100644
--- a/krdc/rdp/rdesktop.patch
+++ b/krdc/rdp/rdesktop.patch
@@ -71,6 +71,6 @@
+ XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0);
+ }
+
- input_tqmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
VisibilityChangeMask | FocusChangeMask;
diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c
index 2975e731..003a7160 100644
--- a/krdc/vnc/desktop.c
+++ b/krdc/vnc/desktop.c
@@ -1380,10 +1380,10 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale,
UintXX *dst_row; \
UintXX c1, c2, c3, c4;\
Uint32 R, G, B, A=0; \
- UintXX Rtqmask = image->red_mask;\
- UintXX Gtqmask = image->green_mask;\
- UintXX Btqmask = image->blue_mask;\
- UintXX Atqmask = 0;\
+ UintXX Rmask = image->red_mask;\
+ UintXX Gmask = image->green_mask;\
+ UintXX Bmask = image->blue_mask;\
+ UintXX Amask = 0;\
Uint32 wx, wy;\
Uint32 p1, p2, p3, p4;\
\
@@ -1449,11 +1449,11 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale,
c4 = *(src_row + (ry+1)*src_pitch + rx+1);\
\
/* Calculate the average */\
- R = ((p1*(c1 & Rtqmask) + p2*(c2 & Rtqmask) + p3*(c3 & Rtqmask) + p4*(c4 & Rtqmask))>>7) & Rtqmask;\
- G = ((p1*(c1 & Gtqmask) + p2*(c2 & Gtqmask) + p3*(c3 & Gtqmask) + p4*(c4 & Gtqmask))>>7) & Gtqmask;\
- B = ((p1*(c1 & Btqmask) + p2*(c2 & Btqmask) + p3*(c3 & Btqmask) + p4*(c4 & Btqmask))>>7) & Btqmask;\
- if(Atqmask)\
- A = ((p1*(c1 & Atqmask) + p2*(c2 & Atqmask) + p3*(c3 & Atqmask) + p4*(c4 & Atqmask))>>7) & Atqmask;\
+ R = ((p1*(c1 & Rmask) + p2*(c2 & Rmask) + p3*(c3 & Rmask) + p4*(c4 & Rmask))>>7) & Rmask;\
+ G = ((p1*(c1 & Gmask) + p2*(c2 & Gmask) + p3*(c3 & Gmask) + p4*(c4 & Gmask))>>7) & Gmask;\
+ B = ((p1*(c1 & Bmask) + p2*(c2 & Bmask) + p3*(c3 & Bmask) + p4*(c4 & Bmask))>>7) & Bmask;\
+ if(Amask)\
+ A = ((p1*(c1 & Amask) + p2*(c2 & Amask) + p3*(c3 & Amask) + p4*(c4 & Amask))>>7) & Amask;\
\
*(dst_row + x) = R | G | B | A;\
} \
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 59ac4c9f..02cd3a78 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -64,7 +64,7 @@ static TQWaitCondition passwordWaiter;
const unsigned int MAX_SELECTION_LENGTH = 4096;
-KVncView::KVncView(TQWidget *tqparent,
+KVncView::KVncView(TQWidget *parent,
const char *name,
const TQString &_host,
int _port,
@@ -72,7 +72,7 @@ KVncView::KVncView(TQWidget *tqparent,
Quality quality,
DotCursorState dotCursorState,
const TQString &encodings) :
- KRemoteView(tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents),
+ KRemoteView(parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents),
m_cthread(this, m_wthread, m_quitFlag),
m_wthread(this, m_quitFlag),
m_quitFlag(false),
@@ -100,7 +100,7 @@ KVncView::KVncView(TQWidget *tqparent,
TQBitmap cursorBitmap(dirs->findResource("appdata",
"pics/pointcursor.png"));
TQBitmap cursorMask(dirs->findResource("appdata",
- "pics/pointcursortqmask.png"));
+ "pics/pointcursormask.png"));
m_cursor = TQCursor(cursorBitmap, cursorMask);
if ((quality != TQUALITY_UNKNOWN) ||
diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h
index 3cd72a5c..7fdf402c 100644
--- a/krdc/vnc/kvncview.h
+++ b/krdc/vnc/kvncview.h
@@ -77,7 +77,7 @@ protected:
bool x11Event(XEvent*);
public:
- KVncView(TQWidget* tqparent=0, const char *name=0,
+ KVncView(TQWidget* parent=0, const char *name=0,
const TQString &host = TQString(""), int port = 5900,
const TQString &password = TQString(),
Quality quality = TQUALITY_UNKNOWN,
diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c
index 371912a4..13676bb6 100644
--- a/krdc/vnc/rfbproto.c
+++ b/krdc/vnc/rfbproto.c
@@ -558,7 +558,7 @@ HandleSoftCursorSetImage(rfbSoftCursorSetImage *msg, rfbRectangle *rect)
/* framebuffer must be locked when calling this!!! */
static Bool
-PointerMove(unsigned int x, unsigned int y, unsigned int tqmask,
+PointerMove(unsigned int x, unsigned int y, unsigned int mask,
int ox, int oy, int ow, int oh)
{
int nx, ny, nw, nh;
@@ -585,7 +585,7 @@ PointerMove(unsigned int x, unsigned int y, unsigned int tqmask,
SyncScreenRegion(nx, ny, nw, nh);
}
- postMouseEvent(cursorX, cursorY, tqmask);
+ postMouseEvent(cursorX, cursorY, mask);
return True;
}
@@ -759,7 +759,7 @@ static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD3
if (width * height == 0)
return True;
- /* Allocate memory for pixel data and temporary tqmask data. */
+ /* Allocate memory for pixel data and temporary mask data. */
rcSource = malloc(width * height * bytesPerPixel);
if (rcSource == NULL)
@@ -830,7 +830,7 @@ static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD3
}
}
- /* Read tqmask data. */
+ /* Read mask data. */
if (!ReadFromRFBServer((char*)rcMask, bytesMaskData)) {
free(rcSource);
diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h
index 9622eb2e..1b5fd839 100644
--- a/krdc/vnc/rfbproto.h
+++ b/krdc/vnc/rfbproto.h
@@ -436,11 +436,11 @@ typedef struct {
* the last tile in each row will be correspondingly smaller. Similarly if the
* height is not an exact multiple of 16 then the height of each tile in the
* final row will also be smaller. Each tile begins with a "subencoding" type
- * byte, which is a tqmask made up of a number of bits. If the Raw bit is set
+ * byte, which is a mask made up of a number of bits. If the Raw bit is set
* then the other bits are irrelevant; w*h pixel values follow (where w and h
* are the width and height of the tile). Otherwise the tile is encoded in a
* similar way to RRE, except that the position and size of each subrectangle
- * can be specified in just two bytes. The other bits in the tqmask are as
+ * can be specified in just two bytes. The other bits in the mask are as
* follows:
*
* BackgroundSpecified - if set, a pixel value follows which specifies
@@ -706,10 +706,10 @@ typedef struct {
CARD16 imageLength;
/*
* Followed by an image of the cursor in the client's image format
- * with the following RLE tqmask compression. It begins with CARD8 that
- * specifies the number of tqmask'ed pixels that will be NOT transmitted.
- * Then follows a CARD8 that specified by the number of untqmask'd pixels
- * that will be transmitted next. Then a CARD8 with the number of tqmask'd
+ * with the following RLE mask compression. It begins with CARD8 that
+ * specifies the number of mask'ed pixels that will be NOT transmitted.
+ * Then follows a CARD8 that specified by the number of unmask'd pixels
+ * that will be transmitted next. Then a CARD8 with the number of mask'd
* pixels and so on.
*/
} rfbSoftCursorSetImage;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-07 19:40:40 +0000