summaryrefslogtreecommitdiffstats
path: root/krfb
diff options
context:
space:
mode:
Diffstat (limited to 'krfb')
-rw-r--r--krfb/kcm_krfb/configurationwidget.ui8
-rw-r--r--krfb/kcm_krfb/kcm_krfb.cpp4
-rw-r--r--krfb/kinetd/kinetd.cpp24
-rw-r--r--krfb/krfb/configuration.cc20
-rw-r--r--krfb/krfb/connectionwidget.ui10
-rw-r--r--krfb/krfb/invitation.cc22
-rw-r--r--krfb/krfb/invitedialog.cc2
-rw-r--r--krfb/krfb/invitewidget.ui14
-rw-r--r--krfb/krfb/manageinvitations.ui4
-rw-r--r--krfb/krfb/personalinvitedialog.cc2
-rw-r--r--krfb/krfb/personalinvitewidget.ui8
-rw-r--r--krfb/krfb/rfbcontroller.cc24
-rw-r--r--krfb/krfb/trayicon.cpp2
-rw-r--r--krfb/libvncserver/cursor.c6
-rw-r--r--krfb/libvncserver/rfb.h12
-rw-r--r--krfb/libvncserver/rfbproto.h12
-rw-r--r--krfb/libvncserver/rfbserver.c26
-rw-r--r--krfb/libvncserver/stats.c2
-rw-r--r--krfb/libvncserver/zlib.c2
-rw-r--r--krfb/srvloc/kserviceregistry.cpp2
-rw-r--r--krfb/srvloc/kserviceregistry.h2
21 files changed, 104 insertions, 104 deletions
diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui
index 7eaf2d96..0eb11995 100644
--- a/krfb/kcm_krfb/configurationwidget.ui
+++ b/krfb/kcm_krfb/configurationwidget.ui
@@ -53,7 +53,7 @@
<property name="title">
<string>Invitations</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<vbox>
@@ -247,7 +247,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>50</height>
@@ -316,7 +316,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -442,7 +442,7 @@ Most VNC clients use a display number instead of the actual port. This display n
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 688b674b..10c77b73 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -19,7 +19,7 @@
#include "kcm_krfb.h"
#include "kcm_krfb.moc"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqradiobutton.h>
@@ -97,7 +97,7 @@ void KcmKRfb::setInvitationNum(int num) {
if (num == 0)
m_confWidget->invitationNumLabel->setText(i18n("You have no open invitation."));
else
- m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").tqarg(num));
+ m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").arg(num));
}
void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index f20076de..2aa7a0cd 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -181,7 +181,7 @@ void PortListener::loadConfig(KService::Ptr s) {
m_dnssdRegister = false;
- m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().addSecs(m_serviceLifetime);
+ m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime);
m_defaultPortBase = m_portBase;
m_defaultAutoPortRange = m_autoPortRange;
@@ -195,7 +195,7 @@ void PortListener::loadConfig(KService::Ptr s) {
TQDateTime nullTime;
m_expirationTime = m_config->readDateTimeEntry("enabled_expiration_"+m_serviceName,
&nullTime);
- if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::tqcurrentDateTime()))
+ if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::currentDateTime()))
m_enabled = false;
m_registerService = m_config->readBoolEntry("enabled_srvreg_"+m_serviceName,
m_registerService);
@@ -210,7 +210,7 @@ void PortListener::accepted(KSocket *sock) {
}
KExtendedSocket::resolve(ksa, host, port);
KNotifyClient::event("IncomingConnection",
- i18n("Connection from %1").tqarg(host));
+ i18n("Connection from %1").arg(host));
delete ksa;
if ((!m_enabled) ||
@@ -226,9 +226,9 @@ void PortListener::accepted(KSocket *sock) {
m_process << m_execPath << m_argument << TQString::number(sock->socket());
if (!m_process.start(KProcess::DontCare)) {
KNotifyClient::event("ProcessFailed",
- i18n("Call \"%1 %2 %3\" failed").tqarg(m_execPath)
- .tqarg(m_argument)
- .tqarg(sock->socket()));
+ i18n("Call \"%1 %2 %3\" failed").arg(m_execPath)
+ .arg(m_argument)
+ .arg(sock->socket()));
}
delete sock;
@@ -356,7 +356,7 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) {
}
m_serviceRegistered = true;
// make lifetime 30s shorter, because the timeout is not precise
- m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().addSecs(m_serviceLifetime-30);
+ m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime-30);
} else {
TQStringList::Iterator it = m_registeredServiceURLs.begin();
while (it != m_registeredServiceURLs.end())
@@ -383,7 +383,7 @@ void PortListener::dnssdRegister(bool e) {
}
void PortListener::refreshRegistration() {
- if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::tqcurrentDateTime())) {
+ if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::currentDateTime())) {
setServiceRegistrationEnabledInternal(false);
setServiceRegistrationEnabledInternal(true);
}
@@ -458,7 +458,7 @@ void KInetD::expirationTimer() {
void KInetD::setExpirationTimer() {
TQDateTime nextEx = getNextExpirationTime(); // disables expired portlistener!
if (!nextEx.isNull())
- m_expirationTimer.start(TQDateTime::tqcurrentDateTime().secsTo(nextEx)*1000 + 30000,
+ m_expirationTimer.start(TQDateTime::currentDateTime().secsTo(nextEx)*1000 + 30000,
false);
else
m_expirationTimer.stop();
@@ -475,7 +475,7 @@ void KInetD::setReregistrationTimer() {
while (pl) {
TQDateTime d2 = pl->serviceLifetimeEnd();
if (!d2.isNull()) {
- if (d2 < TQDateTime::tqcurrentDateTime()) {
+ if (d2 < TQDateTime::currentDateTime()) {
m_reregistrationTimer.start(0, true);
return;
}
@@ -486,7 +486,7 @@ void KInetD::setReregistrationTimer() {
}
if (!d.isNull()) {
- int s = TQDateTime::tqcurrentDateTime().secsTo(d);
+ int s = TQDateTime::currentDateTime().secsTo(d);
if (s < 30)
s = 30; // max frequency 30s
m_reregistrationTimer.start(s*1000, true);
@@ -544,7 +544,7 @@ TQDateTime KInetD::getNextExpirationTime()
while (pl) {
TQDateTime d2 = pl->expiration();
if (!d2.isNull()) {
- if (d2 < TQDateTime::tqcurrentDateTime())
+ if (d2 < TQDateTime::currentDateTime())
pl->setEnabled(false);
else if (d.isNull() || (d2 < d))
d = d2;
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 2076c4ed..bf0e31a7 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -148,7 +148,7 @@ void Configuration::doKinetdConf() {
lastExpiration = t;
it++;
}
- if (lastExpiration.isNull() || (lastExpiration < TQDateTime::tqcurrentDateTime())) {
+ if (lastExpiration.isNull() || (lastExpiration < TQDateTime::currentDateTime())) {
setKInetdEnabled(false);
portNum = -1;
}
@@ -453,15 +453,15 @@ void Configuration::inviteEmail() {
" http://%7:%8/\n"
"\n"
"For security reasons this invitation will expire at %9.")
- .tqarg(inv.password())
- .tqarg(hostname())
- .tqarg(port())
- .tqarg(hostname())
- .tqarg(port())
- .tqarg(inv.password())
- .tqarg(hostname())
- .tqarg(5800) // determine with dcop ... later ...
- .tqarg(KGlobal::locale()->formatDateTime(inv.expirationTime())));
+ .arg(inv.password())
+ .arg(hostname())
+ .arg(port())
+ .arg(hostname())
+ .arg(port())
+ .arg(inv.password())
+ .arg(hostname())
+ .arg(5800) // determine with dcop ... later ...
+ .arg(KGlobal::locale()->formatDateTime(inv.expirationTime())));
}
////////////// invoke kcontrol module //////////////////////////
diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui
index a4a27b02..db280527 100644
--- a/krfb/krfb/connectionwidget.ui
+++ b/krfb/krfb/connectionwidget.ui
@@ -71,7 +71,7 @@
<property name="textFormat">
<enum>AutoText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="indent">
@@ -92,13 +92,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>108</width>
<height>318</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>108</width>
<height>318</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>84</height>
@@ -195,7 +195,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc
index d06feefe..e764036c 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cc
@@ -25,8 +25,8 @@
TQString cryptStr(const TQString &aStr) {
TQString result;
for (unsigned int i = 0; i < aStr.length(); i++)
- result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
- TQChar(0x1001F - aStr[i].tqunicode());
+ result += (aStr[i].unicode() < 0x20) ? aStr[i] :
+ TQChar(0x1001F - aStr[i].unicode());
return result;
}
@@ -59,8 +59,8 @@ static TQString readableRandomString(int length) {
Invitation::Invitation() :
m_viewItem(0) {
m_password = readableRandomString(4)+"-"+readableRandomString(3);
- m_creationTime = TQDateTime::tqcurrentDateTime();
- m_expirationTime = TQDateTime::tqcurrentDateTime().addSecs(INVITATION_DURATION);
+ m_creationTime = TQDateTime::currentDateTime();
+ m_expirationTime = TQDateTime::currentDateTime().addSecs(INVITATION_DURATION);
}
Invitation::Invitation(const Invitation &x) :
@@ -71,9 +71,9 @@ Invitation::Invitation(const Invitation &x) :
}
Invitation::Invitation(KConfig* config, int num) {
- m_password = cryptStr(config->readEntry(TQString("password%1").tqarg(num), ""));
- m_creationTime = config->readDateTimeEntry(TQString("creation%1").tqarg(num));
- m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").tqarg(num));
+ m_password = cryptStr(config->readEntry(TQString("password%1").arg(num), ""));
+ m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num));
+ m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(num));
m_viewItem = 0;
}
@@ -93,9 +93,9 @@ Invitation &Invitation::operator= (const Invitation&x) {
}
void Invitation::save(KConfig *config, int num) const {
- config->writeEntry(TQString("password%1").tqarg(num), cryptStr(m_password));
- config->writeEntry(TQString("creation%1").tqarg(num), m_creationTime);
- config->writeEntry(TQString("expiration%1").tqarg(num), m_expirationTime);
+ config->writeEntry(TQString("password%1").arg(num), cryptStr(m_password));
+ config->writeEntry(TQString("creation%1").arg(num), m_creationTime);
+ config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime);
}
TQString Invitation::password() const {
@@ -111,7 +111,7 @@ TQDateTime Invitation::creationTime() const {
}
bool Invitation::isValid() const {
- return m_expirationTime > TQDateTime::tqcurrentDateTime();
+ return m_expirationTime > TQDateTime::currentDateTime();
}
void Invitation::setViewItem(KListViewItem *i) {
diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc
index 73d55b75..f3b202a9 100644
--- a/krfb/krfb/invitedialog.cc
+++ b/krfb/krfb/invitedialog.cc
@@ -59,7 +59,7 @@ void InviteDialog::enableInviteButton( bool enable )
void InviteDialog::setInviteCount( int count )
{
m_inviteWidget->btnManageInvite->setText(
- i18n( "&Manage Invitations (%1)..." ).tqarg( count ) );
+ i18n( "&Manage Invitations (%1)..." ).arg( count ) );
}
#include "invitedialog.moc"
diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui
index 46f39fec..589f929c 100644
--- a/krfb/krfb/invitewidget.ui
+++ b/krfb/krfb/invitewidget.ui
@@ -59,13 +59,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>108</width>
<height>318</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>108</width>
<height>318</height>
@@ -80,7 +80,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>24</height>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>89</height>
diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui
index 807ce195..d6cfa41b 100644
--- a/krfb/krfb/manageinvitations.ui
+++ b/krfb/krfb/manageinvitations.ui
@@ -38,7 +38,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -55,7 +55,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc
index 245e0069..a5664bcb 100644
--- a/krfb/krfb/personalinvitedialog.cc
+++ b/krfb/krfb/personalinvitedialog.cc
@@ -40,7 +40,7 @@ PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name )
void PersonalInviteDialog::setHost( const TQString &host, uint port )
{
m_inviteWidget->hostLabel->setText( TQString( "%1:%2" )
- .tqarg( host ).tqarg( port ) );
+ .arg( host ).arg( port ) );
}
void PersonalInviteDialog::setPassword( const TQString &passwd )
diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui
index da8ce9d9..9a4e3cd9 100644
--- a/krfb/krfb/personalinvitewidget.ui
+++ b/krfb/krfb/personalinvitewidget.ui
@@ -55,7 +55,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>34</height>
@@ -74,13 +74,13 @@ Give the information below to the person that you want to invite (&lt;a href="wh
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>108</width>
<height>318</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>108</width>
<height>318</height>
@@ -106,7 +106,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 93dc5539..d826ecfe 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -52,7 +52,7 @@
#include <tqlabel.h>
#include <tqmutex.h>
#include <tqdeepcopy.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqdesktopwidget.h>
#include <X11/Xutil.h>
@@ -361,7 +361,7 @@ RFBController::RFBController(Configuration *c) :
connect(&initIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAsyncEvents()));
connect(&idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleSlot()));
- clipboard = TQApplication::tqclipboard();
+ clipboard = TQApplication::clipboard();
connect(clipboard, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
@@ -373,7 +373,7 @@ RFBController::RFBController(Configuration *c) :
if (gethostname(hostname, 255))
hostname[0] = 0;
hostname[255] = 0;
- desktopName = i18n("%1@%2 (shared desktop)").tqarg(KUser().loginName()).tqarg(hostname);
+ desktopName = i18n("%1@%2 (shared desktop)").arg(KUser().loginName()).arg(hostname);
}
RFBController::~RFBController()
@@ -508,7 +508,7 @@ void RFBController::acceptConnection(bool aRemoteControl)
{
KNotifyClient::event("UserAcceptsConnection",
i18n("User accepts connection from %1")
- .tqarg(remoteIp));
+ .arg(remoteIp));
if (state != RFB_CONNECTING)
return;
@@ -521,7 +521,7 @@ void RFBController::refuseConnection()
{
KNotifyClient::event("UserRefusesConnection",
i18n("User refuses connection from %1")
- .tqarg(remoteIp));
+ .arg(remoteIp));
if (state != RFB_CONNECTING)
return;
@@ -569,7 +569,7 @@ void RFBController::connectionClosed()
{
KNotifyClient::event("ConnectionClosed",
i18n("Closed connection: %1.")
- .tqarg(remoteIp));
+ .arg(remoteIp));
idleTimer.stop();
initIdleTimer.stop();
@@ -698,12 +698,12 @@ bool RFBController::handleCheckPassword(rfbClientPtr cl,
if (configuration->invitations().size() > 0) {
sendKNotifyEvent("InvalidPasswordInvitations",
i18n("Failed login attempt from %1: wrong password")
- .tqarg(remoteIp));
+ .arg(remoteIp));
}
else
sendKNotifyEvent("InvalidPassword",
i18n("Failed login attempt from %1: wrong password")
- .tqarg(remoteIp));
+ .arg(remoteIp));
return FALSE;
}
@@ -739,7 +739,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
if (state != RFB_WAITING) {
sendKNotifyEvent("TooManyConnections",
i18n("Connection refused from %1, already connected.")
- .tqarg(host));
+ .arg(host));
return RFB_CLIENT_REFUSE;
}
remoteIp = host;
@@ -749,7 +749,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
(configuration->invitations().size() == 0)) {
sendKNotifyEvent("NewConnectionAutoAccepted",
i18n("Accepted uninvited connection from %1")
- .tqarg(remoteIp));
+ .arg(remoteIp));
connectionAccepted(configuration->allowDesktopControl());
return RFB_CLIENT_ACCEPT;
@@ -757,11 +757,11 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
sendKNotifyEvent("NewConnectionOnHold",
i18n("Received connection from %1, on hold (waiting for confirmation)")
- .tqarg(remoteIp));
+ .arg(remoteIp));
dialog.setRemoteHost(remoteIp);
dialog.setAllowRemoteControl( true );
- dialog.setFixedSize(dialog.tqsizeHint());
+ dialog.setFixedSize(dialog.sizeHint());
dialog.show();
return RFB_CLIENT_ON_HOLD;
}
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 5878b633..14c94bc2 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -101,7 +101,7 @@ void TrayIcon::showConnectedMessage(TQString host) {
i18n("The remote user has been authenticated and is now connected."),
trayIconOpen,
this);
- TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").tqarg(host));
+ TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").arg(host));
}
void TrayIcon::showDisconnectedMessage() {
diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c
index f13eaaf9..a27a2fef 100644
--- a/krfb/libvncserver/cursor.c
+++ b/krfb/libvncserver/cursor.c
@@ -1,5 +1,5 @@
/*
- * cursor.c - support for cursor tqshape updates.
+ * cursor.c - support for cursor shape updates.
*/
/*
@@ -25,11 +25,11 @@
#include "rfb.h"
/*
- * Send cursor tqshape either in X-style format or in client pixel format.
+ * Send cursor shape either in X-style format or in client pixel format.
*/
Bool
-rfbSendtqCursorShape(cl)
+rfbSendCursorShape(cl)
rfbClientPtr cl;
{
rfbCursorPtr pCursor;
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index 56dce45e..e8dbfb65 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -535,10 +535,10 @@ typedef struct _rfbClientRec {
Bool enableLastRectEncoding; /* client supports LastRect encoding */
Bool enableSoftCursorUpdates; /* client supports softcursor updates */
Bool disableBackground; /* client wants to disable background */
- Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */
+ Bool enableCursorShapeUpdates; /* client supports cursor shape updates */
Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */
- Bool cursorWasChanged; /* cursor tqshape update should be sent */
- Bool cursorWasMoved; /* cursor move tqshape update should be sent */
+ Bool cursorWasChanged; /* cursor shape update should be sent */
+ Bool cursorWasMoved; /* cursor move shape update should be sent */
#ifdef BACKCHANNEL
Bool enableBackChannel;
#endif
@@ -569,8 +569,8 @@ typedef struct _rfbClientRec {
*/
#define FB_UPDATE_PENDING(cl) \
- ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \
- ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) || \
+ ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \
+ ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) || \
!sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion))
/*
@@ -733,7 +733,7 @@ typedef struct rfbCursor {
unsigned char *richSource; /* source bytes for a rich cursor */
} rfbCursor, *rfbCursorPtr;
-extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
+extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged);
extern unsigned char rfbReverseByte[0x100];
extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap);
diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h
index e511006e..cd619dff 100644
--- a/krfb/libvncserver/rfbproto.h
+++ b/krfb/libvncserver/rfbproto.h
@@ -30,7 +30,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,
@@ -56,7 +56,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 {
@@ -306,7 +306,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;
@@ -356,7 +356,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 {
@@ -517,7 +517,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
@@ -548,7 +548,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/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c
index 22c9202d..66cc4ee3 100644
--- a/krfb/libvncserver/rfbserver.c
+++ b/krfb/libvncserver/rfbserver.c
@@ -270,7 +270,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
for (i = 0; i < 4; i++)
cl->zsActive[i] = FALSE;
- cl->enabletqCursorShapeUpdates = FALSE;
+ cl->enableCursorShapeUpdates = FALSE;
cl->useRichCursorEncoding = FALSE;
cl->enableLastRectEncoding = FALSE;
cl->disableBackground = FALSE;
@@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl)
cl->preferredEncoding = -1;
cl->useCopyRect = FALSE;
- cl->enabletqCursorShapeUpdates = FALSE;
+ cl->enableCursorShapeUpdates = FALSE;
cl->enableLastRectEncoding = FALSE;
cl->disableBackground = FALSE;
@@ -729,7 +729,7 @@ rfbProcessClientNormalMessage(cl)
if(!cl->screen->dontConvertRichCursorToXCursor) {
rfbLog("Enabling X-style cursor updates for client %s\n",
cl->host);
- cl->enabletqCursorShapeUpdates = TRUE;
+ cl->enableCursorShapeUpdates = TRUE;
cl->cursorWasChanged = TRUE;
}
break;
@@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl)
"%s\n", cl->host);
if (cl->enableSoftCursorUpdates)
break;
- cl->enabletqCursorShapeUpdates = TRUE;
+ cl->enableCursorShapeUpdates = TRUE;
cl->useRichCursorEncoding = TRUE;
cl->cursorWasChanged = TRUE;
break;
@@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl)
cl->enableSoftCursorUpdates = TRUE;
cl->cursorWasChanged = TRUE;
cl->cursorWasMoved = TRUE;
- cl->enabletqCursorShapeUpdates = FALSE;
+ cl->enableCursorShapeUpdates = FALSE;
cl->useRichCursorEncoding = FALSE;
break;
case rfbEncodingLastRect:
@@ -959,24 +959,24 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf;
sraRegionPtr updateRegion,updateCopyRegion,tmpRegion;
int dx, dy;
- Bool sendtqCursorShape = FALSE;
+ Bool sendCursorShape = FALSE;
int sendSoftCursorRects = 0;
if(cl->screen->displayHook)
cl->screen->displayHook(cl);
/*
- * If this client understands cursor tqshape updates, cursor should be
+ * If this client understands cursor shape updates, cursor should be
* removed from the framebuffer. Otherwise, make sure it's put up.
*/
- if (cl->enabletqCursorShapeUpdates) {
+ if (cl->enableCursorShapeUpdates) {
if (cl->screen->cursorIsDrawn) {
rfbUndrawCursor(cl->screen);
}
if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged &&
cl->readyForSetColourMapEntries)
- sendtqCursorShape = TRUE;
+ sendCursorShape = TRUE;
}
else if (cl->enableSoftCursorUpdates) {
if (cl->screen->cursorIsDrawn) {
@@ -1012,7 +1012,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
updateRegion = sraRgnCreateRgn(givenUpdateRegion);
sraRgnOr(updateRegion,cl->copyRegion);
if(!sraRgnAnd(updateRegion,cl->requestedRegion) &&
- !(sendtqCursorShape || sendSoftCursorRects)) {
+ !(sendCursorShape || sendSoftCursorRects)) {
sraRgnDestroy(updateRegion);
UNLOCK(cl->updateMutex);
return TRUE;
@@ -1113,15 +1113,15 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
if (nUpdateRegionRects != 0xFFFF) {
fu->nRects = Swap16IfLE((CARD16)(sraRgnCountRects(updateCopyRegion)
+ nUpdateRegionRects
- + !!sendtqCursorShape + sendSoftCursorRects));
+ + !!sendCursorShape + sendSoftCursorRects));
} else {
fu->nRects = 0xFFFF;
}
cl->ublen = sz_rfbFramebufferUpdateMsg;
- if (sendtqCursorShape) {
+ if (sendCursorShape) {
cl->cursorWasChanged = FALSE;
- if (!rfbSendtqCursorShape(cl)) {
+ if (!rfbSendCursorShape(cl)) {
sraRgnDestroy(updateRegion);
return FALSE;
}
diff --git a/krfb/libvncserver/stats.c b/krfb/libvncserver/stats.c
index 86934011..954e6d14 100644
--- a/krfb/libvncserver/stats.c
+++ b/krfb/libvncserver/stats.c
@@ -82,7 +82,7 @@ rfbPrintStats(rfbClientPtr cl)
cl->rfbLastRectMarkersSent, cl->rfbLastRectBytesSent);
if (cl->rfbCursorUpdatesSent != 0)
- rfbLog(" cursor tqshape updates %d, bytes %d\n",
+ rfbLog(" cursor shape updates %d, bytes %d\n",
cl->rfbCursorUpdatesSent, cl->rfbCursorBytesSent);
for (i = 0; i < MAX_ENCODINGS; i++) {
diff --git a/krfb/libvncserver/zlib.c b/krfb/libvncserver/zlib.c
index d1b300b0..5661d265 100644
--- a/krfb/libvncserver/zlib.c
+++ b/krfb/libvncserver/zlib.c
@@ -89,7 +89,7 @@ rfbSendOneRectEncodingZlib(cl, x, y, w, h)
int result;
/* The translation function (used also by the in raw encoding)
- * requires 4/2/1 byte tqalignment in the output buffer (which is
+ * requires 4/2/1 byte alignment in the output buffer (which is
* updateBuf for the raw encoding) based on the bitsPerPixel of
* the viewer/client. This prevents SIGBUS errors on some
* architectures like SPARC, PARISC...
diff --git a/krfb/srvloc/kserviceregistry.cpp b/krfb/srvloc/kserviceregistry.cpp
index eac3ac18..1dd57881 100644
--- a/krfb/srvloc/kserviceregistry.cpp
+++ b/krfb/srvloc/kserviceregistry.cpp
@@ -119,7 +119,7 @@ bool KServiceRegistry::registerService(const TQString &serviceURL,
while (it != attributes.end()) {
if (!s.isEmpty())
s += ",";
- s += TQString("(%1=%2)").tqarg(it.key()).tqarg(it.data());
+ s += TQString("(%1=%2)").arg(it.key()).arg(it.data());
it++;
}
return registerService(serviceURL, s, lifetime);
diff --git a/krfb/srvloc/kserviceregistry.h b/krfb/srvloc/kserviceregistry.h
index 05e88780..ad2c0b1a 100644
--- a/krfb/srvloc/kserviceregistry.h
+++ b/krfb/srvloc/kserviceregistry.h
@@ -78,7 +78,7 @@ class KServiceRegistryPrivate;
* <pre>
* KServiceRegistry ksr;
* KInetAddress kia = KInetAddress->getLocalAddress();
- * ksr.registerService(TQString("service:remotedesktop.kde:vnc://%1:0").tqarg(kia->nodeName()),
+ * ksr.registerService(TQString("service:remotedesktop.kde:vnc://%1:0").arg(kia->nodeName()),
* "(type=shared)");
* delete kia;
* </pre>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 06:10:02 +0000