diff options
Diffstat (limited to 'krfb')
41 files changed, 291 insertions, 278 deletions
diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui index 66198269..c49101fa 100644 --- a/krfb/kcm_krfb/configurationwidget.ui +++ b/krfb/kcm_krfb/configurationwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ConfigurationWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigurationWidget</cstring> </property> @@ -25,11 +25,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -46,14 +46,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> <property name="title"> <string>Invitations</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <vbox> @@ -66,7 +66,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>invitationNumLabel</cstring> </property> @@ -74,7 +74,7 @@ <string>You have no open invitations.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>manageInvitations</cstring> </property> @@ -95,7 +95,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup7</cstring> </property> @@ -120,7 +120,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allowUninvitedCB</cstring> </property> @@ -134,7 +134,7 @@ <string>Select this option to allow connecting without inviting. This is useful if you want to access your desktop remotely.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>enableSLPCB</cstring> </property> @@ -148,7 +148,7 @@ <string>If you allow uninvited connections and enable this option, Desktop Sharing will announce the service and your identity on the local network, so people can find you and your computer.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>confirmConnectionsCB</cstring> </property> @@ -159,7 +159,7 @@ <string>If enabled, a dialog will appear when somebody attempts to connect, asking you whether you want to accept the connection.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allowDesktopControlCB</cstring> </property> @@ -170,7 +170,7 @@ <string>Enable this option to allow uninvited user to control your desktop (using mouse and keyboard).</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame4</cstring> </property> @@ -188,7 +188,7 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -200,7 +200,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -219,7 +219,7 @@ <cstring>passwordInput</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>passwordInput</cstring> </property> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>50</height> @@ -256,7 +256,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -273,7 +273,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -290,7 +290,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disableBackgroundCB</cstring> </property> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -325,7 +325,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -342,7 +342,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -359,7 +359,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoPortCB</cstring> </property> @@ -373,7 +373,7 @@ <string>Check this option to assign the network port automatically. This is recommended unless your network setup requires you to use a fixed port, for example because of a firewall.</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>portInputFrame</cstring> </property> @@ -396,7 +396,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -495,7 +495,7 @@ Most VNC clients use a display number instead of the actual port. This display n <tabstop>passwordInput</tabstop> <tabstop>portInput</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp index 50595505..688b674b 100644 --- a/krfb/kcm_krfb/kcm_krfb.cpp +++ b/krfb/kcm_krfb/kcm_krfb.cpp @@ -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").arg(num)); + m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").tqarg(num)); } void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) { diff --git a/krfb/kcm_krfb/kcm_krfb.h b/krfb/kcm_krfb/kcm_krfb.h index 9fa81fc9..81be997f 100644 --- a/krfb/kcm_krfb/kcm_krfb.h +++ b/krfb/kcm_krfb/kcm_krfb.h @@ -27,6 +27,7 @@ class KcmKRfb : public KCModule { Q_OBJECT + TQ_OBJECT private: Configuration m_configuration; ConfigurationWidget *m_confWidget; diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index 2f4acadd..5e12ca08 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -102,7 +102,7 @@ void PortListener::loadConfig(KService::Ptr s) { m_valid = true; m_autoPortRange = 0; m_enabled = true; - m_argument = TQString::null; + m_argument = TQString(); m_multiInstance = false; TQVariant vid, vport, vautoport, venabled, vargument, vmultiInstance, vurl, @@ -154,7 +154,7 @@ void PortListener::loadConfig(KService::Ptr s) { m_registerService = true; } else { - m_serviceURL = TQString::null; + m_serviceURL = TQString(); m_registerService = false; } if (vsattributes.isValid()) { @@ -181,7 +181,7 @@ void PortListener::loadConfig(KService::Ptr s) { m_dnssdRegister = false; - m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime); + m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().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::currentDateTime())) + if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::tqcurrentDateTime())) 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").arg(host)); + i18n("Connection from %1").tqarg(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").arg(m_execPath) - .arg(m_argument) - .arg(sock->socket())); + i18n("Call \"%1 %2 %3\" failed").tqarg(m_execPath) + .tqarg(m_argument) + .tqarg(sock->socket())); } delete sock; @@ -257,11 +257,11 @@ TQStringList PortListener::processServiceTemplate(const TQString &a) { TQString hostName = address->nodeName(); KUser u; TQString x = a; // replace does not work in const TQString. Why?? - l.append(x.replace(TQRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName)) - .replace(TQRegExp("%p"), TQString::number(m_port)) - .replace(TQRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName())) - .replace(TQRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid)) - .replace(TQRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName()))); + l.append(x.tqreplace(TQRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName)) + .tqreplace(TQRegExp("%p"), TQString::number(m_port)) + .tqreplace(TQRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName())) + .tqreplace(TQRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid)) + .tqreplace(TQRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName()))); } return l; } @@ -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::currentDateTime().addSecs(m_serviceLifetime-30); + m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().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::currentDateTime())) { + if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::tqcurrentDateTime())) { 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::currentDateTime().secsTo(nextEx)*1000 + 30000, + m_expirationTimer.start(TQDateTime::tqcurrentDateTime().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::currentDateTime()) { + if (d2 < TQDateTime::tqcurrentDateTime()) { m_reregistrationTimer.start(0, true); return; } @@ -486,7 +486,7 @@ void KInetD::setReregistrationTimer() { } if (!d.isNull()) { - int s = TQDateTime::currentDateTime().secsTo(d); + int s = TQDateTime::tqcurrentDateTime().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::currentDateTime()) + if (d2 < TQDateTime::tqcurrentDateTime()) pl->setEnabled(false); else if (d.isNull() || (d2 < d)) d = d2; diff --git a/krfb/kinetd/kinetd.h b/krfb/kinetd/kinetd.h index 32bb2885..83049355 100644 --- a/krfb/kinetd/kinetd.h +++ b/krfb/kinetd/kinetd.h @@ -33,6 +33,8 @@ class PortListener : public TQObject { Q_OBJECT +// TQ_OBJECT + private: bool m_valid; TQString m_serviceName; @@ -92,6 +94,7 @@ private slots: class KInetD : public KDEDModule { Q_OBJECT +// TQ_OBJECT K_DCOP k_dcop: diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index 03439b9d..1547141d 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -64,7 +64,7 @@ Configuration::Configuration(krfb_mode mode) : connect(invMngDlg.deleteOneButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteOnePressed())); connect(invMngDlg.deleteAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteAllPressed())); invMngDlg.listView->setSelectionMode(TQListView::Extended); - invMngDlg.listView->setMinimumSize(TQSize(400, 100)); // QTs size is much to small + invMngDlg.listView->setMinimumSize(TQSize(400, 100)); // TQTs size is much to small connect(&invDlg, TQT_SIGNAL(createInviteClicked()), TQT_SLOT(showPersonalInvitationDialog())); @@ -148,7 +148,7 @@ void Configuration::doKinetdConf() { lastExpiration = t; it++; } - if (lastExpiration.isNull() || (lastExpiration < TQDateTime::currentDateTime())) { + if (lastExpiration.isNull() || (lastExpiration < TQDateTime::tqcurrentDateTime())) { setKInetdEnabled(false); portNum = -1; } @@ -181,7 +181,7 @@ void Configuration::loadFromKConfig() { for (int i = 0; i < num; i++) invitationList.push_back(Invitation(&c, i)); - invalidateOldInvitations(); + tqinvalidateOldInvitations(); if (invNum != invitationList.size()) emit invitationNumChanged(invitationList.size()); @@ -212,7 +212,7 @@ void Configuration::saveToKConfig() { } void Configuration::saveToDialogs() { - invalidateOldInvitations(); + tqinvalidateOldInvitations(); TQValueList<Invitation>::iterator it = invitationList.begin(); while (it != invitationList.end()) { Invitation &inv = *(it++); @@ -241,7 +241,7 @@ Invitation Configuration::createInvitation() { return inv; } -void Configuration::invalidateOldInvitations() { +void Configuration::tqinvalidateOldInvitations() { TQValueList<Invitation>::iterator it = invitationList.begin(); while (it != invitationList.end()) { if (!(*it).isValid()) @@ -439,7 +439,7 @@ void Configuration::inviteEmail() { emit invitationNumChanged(invitationList.size()); KApplication *app = KApplication::kApplication(); - app->invokeMailer(TQString::null, TQString::null, TQString::null, + app->invokeMailer(TQString(), TQString(), TQString(), i18n("Desktop Sharing (VNC) invitation"), i18n("You have been invited to a VNC session. If you have the KDE Remote " "Desktop Connection installed, just click on the link below.\n\n" @@ -453,15 +453,15 @@ void Configuration::inviteEmail() { " http://%7:%8/\n" "\n" "For security reasons this invitation will expire at %9.") - .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()))); + .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()))); } ////////////// invoke kcontrol module ////////////////////////// diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h index 57e03385..dd8f5fb7 100644 --- a/krfb/krfb/configuration.h +++ b/krfb/krfb/configuration.h @@ -49,6 +49,7 @@ enum krfb_mode { class Configuration : public TQObject, public DCOPObject { K_DCOP Q_OBJECT +// TQ_OBJECT public: Configuration(krfb_mode mode); virtual ~Configuration(); @@ -96,7 +97,7 @@ private: void saveToDialogs(); Invitation createInvitation(); void closeInvDlg(); - void invalidateOldInvitations(); + void tqinvalidateOldInvitations(); void setKInetdEnabled(const TQDateTime &date); void setKInetdEnabled(bool enabled); void setKInetdServiceRegistrationEnabled(bool enabled); diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc index d767b5a2..f881f28d 100644 --- a/krfb/krfb/connectiondialog.cc +++ b/krfb/krfb/connectiondialog.cc @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <klocale.h> -ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n( "New Connection" ), +ConnectionDialog::ConnectionDialog( TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n( "New Connection" ), Ok|Cancel, Cancel, true ) { m_connectWidget = new ConnectionWidget( this, "ConnectWidget" ); diff --git a/krfb/krfb/connectiondialog.h b/krfb/krfb/connectiondialog.h index c5f7e589..967587a5 100644 --- a/krfb/krfb/connectiondialog.h +++ b/krfb/krfb/connectiondialog.h @@ -27,9 +27,10 @@ class ConnectionWidget; class ConnectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConnectionDialog( TQWidget *parent, const char *name ); + ConnectionDialog( TQWidget *tqparent, const char *name ); ~ConnectionDialog() {}; void setRemoteHost( const TQString &host ); diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui index e053adf9..93cb3a4e 100644 --- a/krfb/krfb/connectionwidget.ui +++ b/krfb/krfb/connectionwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConnectionWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NewConnectWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -44,7 +44,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>mainTextLabel</cstring> </property> @@ -71,7 +71,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="indent"> @@ -80,7 +80,7 @@ <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="6" colspan="1"> <property name="name"> <cstring>pixmapLabel</cstring> </property> @@ -92,13 +92,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>108</width> <height>318</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>108</width> <height>318</height> @@ -123,7 +123,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>remoteHost</cstring> </property> @@ -136,7 +136,7 @@ <string>123.234.123.234</string> </property> </widget> - <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cbAllowRemoteControl</cstring> </property> @@ -155,7 +155,7 @@ <string>If you turn this option on, the remote user can enter keystrokes and use your mouse pointer. This gives them full control over your computer, so be careful. When the option is disabled the remote user can only watch your screen.</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>84</height> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -204,5 +204,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc index e764036c..d06feefe 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].unicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].unicode()); + result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].tqunicode()); 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::currentDateTime(); - m_expirationTime = TQDateTime::currentDateTime().addSecs(INVITATION_DURATION); + m_creationTime = TQDateTime::tqcurrentDateTime(); + m_expirationTime = TQDateTime::tqcurrentDateTime().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").arg(num), "")); - m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num)); - m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(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_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").arg(num), cryptStr(m_password)); - config->writeEntry(TQString("creation%1").arg(num), m_creationTime); - config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime); + 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); } TQString Invitation::password() const { @@ -111,7 +111,7 @@ TQDateTime Invitation::creationTime() const { } bool Invitation::isValid() const { - return m_expirationTime > TQDateTime::currentDateTime(); + return m_expirationTime > TQDateTime::tqcurrentDateTime(); } void Invitation::setViewItem(KListViewItem *i) { diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc index f3b202a9..046a7a92 100644 --- a/krfb/krfb/invitedialog.cc +++ b/krfb/krfb/invitedialog.cc @@ -27,8 +27,8 @@ #include <tqlabel.h> #include <tqpushbutton.h> -InviteDialog::InviteDialog( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n( "Invitation" ), +InviteDialog::InviteDialog( TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n( "Invitation" ), User1|Close|Help, NoDefault, true ) { m_inviteWidget = new InviteWidget( this, "InviteWidget" ); @@ -59,7 +59,7 @@ void InviteDialog::enableInviteButton( bool enable ) void InviteDialog::setInviteCount( int count ) { m_inviteWidget->btnManageInvite->setText( - i18n( "&Manage Invitations (%1)..." ).arg( count ) ); + i18n( "&Manage Invitations (%1)..." ).tqarg( count ) ); } #include "invitedialog.moc" diff --git a/krfb/krfb/invitedialog.h b/krfb/krfb/invitedialog.h index a1de109b..6ce32097 100644 --- a/krfb/krfb/invitedialog.h +++ b/krfb/krfb/invitedialog.h @@ -27,9 +27,10 @@ class InviteWidget; class InviteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - InviteDialog( TQWidget *parent, const char *name ); + InviteDialog( TQWidget *tqparent, const char *name ); ~InviteDialog() {} void enableInviteButton( bool enable ); diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui index b0d80c36..9a137d31 100644 --- a/krfb/krfb/invitewidget.ui +++ b/krfb/krfb/invitewidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>InviteWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>InviteWidget</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -47,7 +47,7 @@ <a href="whatsthis:<p>An invitation creates a one-time password that allows the receiver to connect to your desktop. It is valid for only one successful connection and will expire after an hour if it has not been used. When somebody connects to your computer a dialog will appear and ask you for permission. The connection will not be established before you accept it. In this dialog you can also restrict the other person to view your desktop only, without the ability to move your mouse pointer or press keys.</p><p>If you want to create a permanent password for Desktop Sharing, allow 'Uninvited Connections' in the configuration.</p>">More about invitations...</a></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="7" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="7" colspan="1"> <property name="name"> <cstring>pixmapLabel</cstring> </property> @@ -59,13 +59,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>108</width> <height>318</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>108</width> <height>318</height> @@ -80,7 +80,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -94,14 +94,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>btnCreateInvite</cstring> </property> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>24</height> @@ -142,14 +142,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="5" column="2"> + <widget class="TQPushButton" row="5" column="2"> <property name="name"> <cstring>btnManageInvite</cstring> </property> @@ -157,7 +157,7 @@ <string>&Manage Invitations (%1)...</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>btnEmailInvite</cstring> </property> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>89</height> @@ -187,11 +187,11 @@ </spacer> </grid> </widget> -<signals> +<Q_SIGNALS> <signal>createInviteClicked()</signal> <signal>emailInviteClicked()</signal> <signal>manageInviteClicked()</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/krfb/krfb/krfbifaceimpl.h b/krfb/krfb/krfbifaceimpl.h index 21f3a022..3f498a38 100644 --- a/krfb/krfb/krfbifaceimpl.h +++ b/krfb/krfb/krfbifaceimpl.h @@ -8,6 +8,7 @@ class KRfbIfaceImpl : public TQObject, public virtual krfbIface { Q_OBJECT + TQ_OBJECT private: RFBController *controller; public: diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index eae26507..a9338792 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ManageInvitationsDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ManageInvitationsDialog</cstring> </property> @@ -38,7 +38,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -104,7 +104,7 @@ <string>Displays the open invitations. Use the buttons on the right to delete them or create a new invitation.</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>newPersonalInvitationButton</cstring> </property> @@ -118,7 +118,7 @@ <string>Click this button to create a new personal invitation.</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>newEmailInvitationButton</cstring> </property> @@ -132,7 +132,7 @@ <string>Click this button to send a new invitation via email.</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>deleteAllButton</cstring> </property> @@ -149,7 +149,7 @@ <string>Deletes all open invitations.</string> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>deleteOneButton</cstring> </property> @@ -166,7 +166,7 @@ <string>Delete the selected invitation. The invited person will not be able to connect using this invitation anymore.</string> </property> </widget> - <widget class="QPushButton" row="6" column="1" rowspan="2" colspan="1"> + <widget class="TQPushButton" row="6" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>closeButton</cstring> </property> @@ -205,11 +205,11 @@ <include location="global" impldecl="in declaration">klistview.h</include> <include location="local" impldecl="in implementation">manageinvitations.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>listSizeChanged( int i )</slot> <slot>listSelectionChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc index a5664bcb..1f61e392 100644 --- a/krfb/krfb/personalinvitedialog.cc +++ b/krfb/krfb/personalinvitedialog.cc @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <klocale.h> -PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n( "Personal Invitation" ), +PersonalInviteDialog::PersonalInviteDialog( TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n( "Personal Invitation" ), Close, Close, true ) { m_inviteWidget = new PersonalInviteWidget( this, "PersonalInviteWidget" ); @@ -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" ) - .arg( host ).arg( port ) ); + .tqarg( host ).tqarg( port ) ); } void PersonalInviteDialog::setPassword( const TQString &passwd ) diff --git a/krfb/krfb/personalinvitedialog.h b/krfb/krfb/personalinvitedialog.h index 6f28a33d..89be019c 100644 --- a/krfb/krfb/personalinvitedialog.h +++ b/krfb/krfb/personalinvitedialog.h @@ -29,7 +29,7 @@ class PersonalInviteWidget; class PersonalInviteDialog : public KDialogBase { public: - PersonalInviteDialog( TQWidget *parent, const char *name ); + PersonalInviteDialog( TQWidget *tqparent, const char *name ); virtual ~PersonalInviteDialog() {} void setHost( const TQString &host, uint port ); diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui index 9ac68eb7..04e970b5 100644 --- a/krfb/krfb/personalinvitewidget.ui +++ b/krfb/krfb/personalinvitewidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PersonalInviteWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -55,14 +55,14 @@ Give the information below to the person that you want to invite (<a href="wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>34</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="6" colspan="1"> <property name="name"> <cstring>pixmapLabel</cstring> </property> @@ -74,13 +74,13 @@ Give the information below to the person that you want to invite (<a href="wh <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>108</width> <height>318</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>108</width> <height>318</height> @@ -106,7 +106,7 @@ Give the information below to the person that you want to invite (<a href="wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -132,7 +132,7 @@ Give the information below to the person that you want to invite (<a href="wh <string>cookie.tjansen.de:0</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>kActiveLabel6</cstring> </property> @@ -148,7 +148,7 @@ Give the information below to the person that you want to invite (<a href="wh <string><b>Password:</b></string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>kActiveLabel7</cstring> </property> @@ -202,7 +202,7 @@ Give the information below to the person that you want to invite (<a href="wh <string>17:12</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>kActiveLabel5</cstring> </property> @@ -236,6 +236,6 @@ Give the information below to the person that you want to invite (<a href="wh </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 51516683..82ad4ad9 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -88,7 +88,7 @@ static const char* cur= " xxx " " "; -static const char* mask= +static const char* tqmask= "xx " "xxx " "xxxx " @@ -279,7 +279,7 @@ Display *PointerEvent::dpy; int PointerEvent::buttonMask = 0; PointerEvent::PointerEvent(int b, int _x, int _y) : - button_mask(b), + button_tqmask(b), x(_x), y(_y) { if (!initialized) { @@ -297,13 +297,13 @@ void PointerEvent::exec() { screen = 0; XTestFakeMotionEvent(dpy, screen, x, y, CurrentTime); for(int i = 0; i < 5; i++) - if ((buttonMask&(1<<i))!=(button_mask&(1<<i))) + if ((buttonMask&(1<<i))!=(button_tqmask&(1<<i))) XTestFakeButtonEvent(dpy, i+1, - (button_mask&(1<<i))?True:False, + (button_tqmask&(1<<i))?True:False, CurrentTime); - buttonMask = button_mask; + buttonMask = button_tqmask; } @@ -320,8 +320,8 @@ void ClipboardEvent::exec() { controller->lastClipboardDirection = RFBController::LAST_SYNC_TO_SERVER; controller->lastClipboardText = text; - controller->clipboard->setText(text, QClipboard::Clipboard); - controller->clipboard->setText(text, QClipboard::Selection); + controller->clipboard->setText(text, TQClipboard::Clipboard); + controller->clipboard->setText(text, TQClipboard::Selection); } @@ -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::clipboard(); + clipboard = TQApplication::tqclipboard(); 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)").arg(KUser().loginName()).arg(hostname); + desktopName = i18n("%1@%2 (shared desktop)").tqarg(KUser().loginName()).tqarg(hostname); } RFBController::~RFBController() @@ -450,7 +450,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab) server->desktopName = desktopName.latin1(); if (!myCursor) - myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) mask); + myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) tqmask); server->cursor = myCursor; passwordChanged(); @@ -508,7 +508,7 @@ void RFBController::acceptConnection(bool aRemoteControl) { KNotifyClient::event("UserAcceptsConnection", i18n("User accepts connection from %1") - .arg(remoteIp)); + .tqarg(remoteIp)); if (state != RFB_CONNECTING) return; @@ -521,7 +521,7 @@ void RFBController::refuseConnection() { KNotifyClient::event("UserRefusesConnection", i18n("User refuses connection from %1") - .arg(remoteIp)); + .tqarg(remoteIp)); if (state != RFB_CONNECTING) return; @@ -569,7 +569,7 @@ void RFBController::connectionClosed() { KNotifyClient::event("ConnectionClosed", i18n("Closed connection: %1.") - .arg(remoteIp)); + .tqarg(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") - .arg(remoteIp)); + .tqarg(remoteIp)); } else sendKNotifyEvent("InvalidPassword", i18n("Failed login attempt from %1: wrong password") - .arg(remoteIp)); + .tqarg(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.") - .arg(host)); + .tqarg(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") - .arg(remoteIp)); + .tqarg(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)") - .arg(remoteIp)); + .tqarg(remoteIp)); dialog.setRemoteHost(remoteIp); dialog.setAllowRemoteControl( true ); - dialog.setFixedSize(dialog.sizeHint()); + dialog.setFixedSize(dialog.tqsizeHint()); dialog.show(); return RFB_CLIENT_ON_HOLD; } @@ -814,7 +814,7 @@ void RFBController::clipboardChanged() { if (clipboard->ownsClipboard()) return; - TQString text = clipboard->text(QClipboard::Clipboard); + TQString text = clipboard->text(TQClipboard::Clipboard); // avoid ping-pong between client&server if ((lastClipboardDirection == LAST_SYNC_TO_SERVER) && @@ -835,7 +835,7 @@ void RFBController::selectionChanged() { if (clipboard->ownsSelection()) return; - TQString text = clipboard->text(QClipboard::Selection); + TQString text = clipboard->text(TQClipboard::Selection); // avoid ping-pong between client&server if ((lastClipboardDirection == LAST_SYNC_TO_SERVER) && (lastClipboardText == text)) diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h index 6ef49a6d..d0d8af36 100644 --- a/krfb/krfb/rfbcontroller.h +++ b/krfb/krfb/rfbcontroller.h @@ -39,7 +39,7 @@ class TQCloseEvent; -class QClipboard; +class TQClipboard; class RFBController; typedef enum { @@ -77,7 +77,7 @@ public: }; class PointerEvent : public VNCEvent { - int button_mask, x, y; + int button_tqmask, x, y; static bool initialized; static Display *dpy; @@ -122,6 +122,7 @@ public: */ class RFBController : public TQObject { Q_OBJECT + TQ_OBJECT friend class SessionEstablishedEvent; friend class ClipboardEvent; @@ -137,7 +138,7 @@ public: void connectionClosed(); bool handleCheckPassword(rfbClientPtr, const char *, int); void handleKeyEvent(bool down, KeySym keySym); - void handlePointerEvent(int button_mask, int x, int y); + void handlePointerEvent(int button_tqmask, int x, int y); enum rfbNewClientAction handleNewClient(rfbClientPtr cl); void clipboardToServer(const TQString &text); void handleClientGone(); @@ -176,7 +177,7 @@ private: LAST_SYNC_TO_CLIENT } lastClipboardDirection; TQString lastClipboardText; - QClipboard *clipboard; + TQClipboard *clipboard; Configuration *configuration; XUpdateScanner *scanner; @@ -210,6 +211,7 @@ private slots: */ class XTestDisabler : public TQObject { Q_OBJECT + TQ_OBJECT public: XTestDisabler(); bool disable; diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index f7d2c64a..c9215d46 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -25,8 +25,8 @@ #include <kiconloader.h> #include <kpopupmenu.h> -KPassivePopup2::KPassivePopup2(TQWidget *parent) : - KPassivePopup(parent){ +KPassivePopup2::KPassivePopup2(TQWidget *tqparent) : + KPassivePopup(tqparent){ } void KPassivePopup2::hideEvent( TQHideEvent *e ) @@ -37,9 +37,9 @@ void KPassivePopup2::hideEvent( TQHideEvent *e ) KPassivePopup2 *KPassivePopup2::message( const TQString &caption, const TQString &text, const TQPixmap &icon, - TQWidget *parent) + TQWidget *tqparent) { - KPassivePopup2 *pop = new KPassivePopup2( parent); + KPassivePopup2 *pop = new KPassivePopup2( tqparent); pop->setView( caption, text, icon ); pop->show(); @@ -60,8 +60,8 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : setPixmap(trayIconClosed); TQToolTip::add(this, i18n("Desktop Sharing - connecting")); - manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString::null, - 0, this, TQT_SIGNAL(showManageInvitations()), + manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString(), + 0, TQT_TQOBJECT(this), TQT_SIGNAL(showManageInvitations()), &actionCollection); manageInvitationsAction->plug(contextMenu()); @@ -75,7 +75,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : contextMenu()->insertSeparator(); - aboutAction = KStdAction::aboutApp(this, TQT_SLOT(showAbout()), &actionCollection); + aboutAction = KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(showAbout()), &actionCollection); aboutAction->plug(contextMenu()); show(); @@ -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").arg(host)); + TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").tqarg(host)); } void TrayIcon::showDisconnectedMessage() { @@ -124,10 +124,10 @@ void TrayIcon::setDesktopControlSetting(bool b) { void TrayIcon::mousePressEvent(TQMouseEvent *e) { - if (!rect().contains(e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) return; - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { contextMenuAboutToShow(contextMenu()); contextMenu()->popup(e->globalPos()); } diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h index ea4e7132..21e7aac2 100644 --- a/krfb/krfb/trayicon.h +++ b/krfb/krfb/trayicon.h @@ -30,11 +30,12 @@ class KDialog; class KPassivePopup2 : public KPassivePopup { Q_OBJECT + TQ_OBJECT public: - KPassivePopup2(TQWidget *parent); + KPassivePopup2(TQWidget *tqparent); static KPassivePopup2 *message( const TQString &caption, const TQString &text, const TQPixmap &icon, - TQWidget *parent); + TQWidget *tqparent); signals: void hidden(); @@ -53,6 +54,7 @@ protected: class TrayIcon : public KSystemTray { Q_OBJECT + TQ_OBJECT public: TrayIcon(KDialog*, Configuration*); ~TrayIcon(); diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index a27a2fef..d943dc37 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -1,5 +1,5 @@ /* - * cursor.c - support for cursor shape updates. + * cursor.c - support for cursor tqshape updates. */ /* @@ -25,18 +25,18 @@ #include "rfb.h" /* - * Send cursor shape either in X-style format or in client pixel format. + * Send cursor tqshape either in X-style format or in client pixel format. */ Bool -rfbSendCursorShape(cl) +rfbSendtqCursorShape(cl) rfbClientPtr cl; { rfbCursorPtr pCursor; rfbFramebufferUpdateRectHeader rect; rfbXCursorColors colors; int saved_ublen; - int bitmapRowBytes, maskBytes, dataBytes; + int bitmapRowBytes, tqmaskBytes, dataBytes; int i, j; CARD8 *bitmapData; CARD8 bitmapByte; @@ -58,7 +58,7 @@ rfbSendCursorShape(cl) if ( pCursor && pCursor->width == 1 && pCursor->height == 1 && - pCursor->mask[0] == 0 ) { + pCursor->tqmask[0] == 0 ) { pCursor = NULL; } @@ -85,21 +85,21 @@ rfbSendCursorShape(cl) /* Calculate data sizes. */ bitmapRowBytes = (pCursor->width + 7) / 8; - maskBytes = bitmapRowBytes * pCursor->height; + tqmaskBytes = bitmapRowBytes * pCursor->height; dataBytes = (cl->useRichCursorEncoding) ? (pCursor->width * pCursor->height * - (cl->format.bitsPerPixel / 8)) : maskBytes; + (cl->format.bitsPerPixel / 8)) : tqmaskBytes; /* Send buffer contents if needed. */ if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + - sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) { + sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { if (!rfbSendUpdateBuf(cl)) return FALSE; } if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + - sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) { + sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { return FALSE; /* FIXME. */ } @@ -150,9 +150,9 @@ rfbSendCursorShape(cl) cl->ublen += pCursor->width*bpp2*pCursor->height; } - /* Prepare transparency mask. */ + /* Prepare transparency tqmask. */ - bitmapData = (CARD8 *)pCursor->mask; + bitmapData = (CARD8 *)pCursor->tqmask; for (i = 0; i < pCursor->height; i++) { for (j = 0; j < bitmapRowBytes; j++) { @@ -199,7 +199,7 @@ rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged) if ( pCursor && pCursor->width <= 1 && pCursor->height <= 1 && - pCursor->mask[0] == 0 ) { + pCursor->tqmask[0] == 0 ) { pCursor = NULL; } @@ -347,7 +347,7 @@ void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap) /* Cursor creation. You "paint" a cursor and let these routines do the work */ -rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString) +rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString) { int i,j,w=(width+7)/8; rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor)); @@ -364,13 +364,13 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) if(*cp!=' ') cursor->source[j*w+i/8]|=bit; - if(maskString) { - cursor->mask = (unsigned char*)calloc(w,height); - for(j=0,cp=maskString;j<height;j++) + if(tqmaskString) { + cursor->tqmask = (unsigned char*)calloc(w,height); + for(j=0,cp=tqmaskString;j<height;j++) for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) - if(*cp!=' ') cursor->mask[j*w+i/8]|=bit; + if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit; } else - cursor->mask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source); + cursor->tqmask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source); return(cursor); } @@ -378,7 +378,7 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt char* rfbMakeMaskForXCursor(int width,int height,char* source) { int i,j,w=(width+7)/8; - char* mask=(char*)calloc(w,height); + char* tqmask=(char*)calloc(w,height); unsigned char c; for(j=0;j<height;j++) @@ -388,14 +388,14 @@ char* rfbMakeMaskForXCursor(int width,int height,char* source) if(j<height-1) c|=source[(j+1)*w+i]; if(i>0 && (c&0x80)) - mask[j*w+i-1]|=0x01; + tqmask[j*w+i-1]|=0x01; if(i<w-1 && (c&0x01)) - mask[j*w+i+1]|=0x80; + tqmask[j*w+i+1]|=0x80; - mask[j*w+i]|=(c<<1)|c|(c>>1); + tqmask[j*w+i]|=(c<<1)|c|(c>>1); } - return(mask); + return(tqmask); } void rfbFreeCursor(rfbCursorPtr cursor) @@ -404,7 +404,7 @@ void rfbFreeCursor(rfbCursorPtr cursor) if(cursor->richSource) free(cursor->richSource); free(cursor->source); - free(cursor->mask); + free(cursor->tqmask); free(cursor); } @@ -497,7 +497,7 @@ void MakeSoftCursor(rfbClientPtr cl, rfbCursorPtr cursor) for(j=0;j<cursor->height;j++) for(i=0,bit=0x80;i<cursor->width;i++,bit=(bit&1)?0x80:bit>>1) - if(cursor->mask[j*w+i/8]&bit) { + if(cursor->tqmask[j*w+i/8]&bit) { if (state) { memcpy(cp,sp,bpp); cp += bpp; @@ -634,7 +634,7 @@ void rfbDrawCursor(rfbScreenInfoPtr s) /* now the cursor has to be drawn */ for(j=0;j<y2;j++) for(i=0;i<x2;i++) - if((c->mask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80) + if((c->tqmask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80) memcpy(s->frameBuffer+(j+y1)*rowstride+(i+x1)*bpp, c->richSource+(j+j1)*c->width*bpp+(i+i1)*bpp,bpp); @@ -655,7 +655,7 @@ void rfbPrintXCursor(rfbCursorPtr cursor) if(cursor->source[j*w+i]&bit) putchar('#'); else putchar(' '); putchar(':'); for(i=0,i1=0,bit=0x80;i1<cursor->width;i1++,i+=(bit&1)?1:0,bit=(bit&1)?0x80:bit>>1) - if(cursor->mask[j*w+i]&bit) putchar('#'); else putchar(' '); + if(cursor->tqmask[j*w+i]&bit) putchar('#'); else putchar(' '); putchar('\n'); } } diff --git a/krfb/libvncserver/example.c b/krfb/libvncserver/example.c index 1cdda701..63f58e21 100644 --- a/krfb/libvncserver/example.c +++ b/krfb/libvncserver/example.c @@ -252,7 +252,7 @@ int main(int argc,char** argv) initBuffer(rfbScreen->frameBuffer); rfbDrawString(rfbScreen,&radonFont,20,100,"Hello, World!",0xffffff); - /* This call creates a mask and then a cursor: */ + /* This call creates a tqmask and then a cursor: */ /* rfbScreen->defaultCursor = rfbMakeXCursor(exampleCursorWidth,exampleCursorHeight,exampleCursor,0); */ diff --git a/krfb/libvncserver/fontsel.c b/krfb/libvncserver/fontsel.c index 100db817..5d7664de 100644 --- a/krfb/libvncserver/fontsel.c +++ b/krfb/libvncserver/fontsel.c @@ -54,7 +54,7 @@ int main(int argc,char** argv) rfbScreen = s; font=rfbLoadConsoleFont(DEFAULTFONT); if(!font) { - fprintf(stderr,"Couldn't find %s\n",DEFAULTFONT); + fprintf(stderr,"Couldn't tqfind %s\n",DEFAULTFONT); exit(1); } diff --git a/krfb/libvncserver/main.c b/krfb/libvncserver/main.c index 207e512d..c9bde3fe 100644 --- a/krfb/libvncserver/main.c +++ b/krfb/libvncserver/main.c @@ -413,12 +413,12 @@ static rfbCursor myCursor = static rfbCursor myCursor = { source: "\000\102\044\030\044\102\000", - mask: "\347\347\176\074\176\347\347", + tqmask: "\347\347\176\074\176\347\347", width: 8, height: 7, xhot: 3, yhot: 3, /* width: 8, height: 7, xhot: 0, yhot: 0, source: "\000\074\176\146\176\074\000", - mask: "\176\377\377\377\377\377\176", + tqmask: "\176\377\377\377\377\377\176", */ foreRed: 0, foreGreen: 0, foreBlue: 0, backRed: 0xffff, backGreen: 0xffff, backBlue: 0xffff, diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index b715ca8a..aba56cfa 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -263,7 +263,7 @@ typedef struct _rfbScreenInfo themselves end up invoking drawing routines. Removing the cursor (rfbUndrawCursor) is eventually achieved by - doing a CopyArea from a pixmap to the screen, where the pixmap contains + doing a CopyArea from a pixmap to the screen, where the pixmap tqcontains the saved contents of the screen under the cursor. Before doing this, however, we set cursorIsDrawn to FALSE. Then, when CopyArea is called, it sees that cursorIsDrawn is FALSE and so doesn't feel the need to @@ -542,10 +542,10 @@ typedef struct _rfbClientRec { Bool enableLastRectEncoding; /* client supports LastRect encoding */ Bool enableSoftCursorUpdates; /* client supports softcursor updates */ Bool disableBackground; /* client wants to disable background */ - Bool enableCursorShapeUpdates; /* client supports cursor shape updates */ + Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */ Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */ - Bool cursorWasChanged; /* cursor shape update should be sent */ - Bool cursorWasMoved; /* cursor move shape update should be sent */ + Bool cursorWasChanged; /* cursor tqshape update should be sent */ + Bool cursorWasMoved; /* cursor move tqshape update should be sent */ #ifdef BACKCHANNEL Bool enableBackChannel; #endif @@ -576,8 +576,8 @@ typedef struct _rfbClientRec { */ #define FB_UPDATE_PENDING(cl) \ - ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \ - ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) || \ + ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \ + ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) || \ !sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion)) /* @@ -733,18 +733,18 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h); typedef struct rfbCursor { unsigned char *source; /* points to bits */ - unsigned char *mask; /* points to bits */ + unsigned char *tqmask; /* points to bits */ unsigned short width, height, xhot, yhot; /* metrics */ unsigned short foreRed, foreGreen, foreBlue; /* device-independent colour */ unsigned short backRed, backGreen, backBlue; /* device-independent colour */ unsigned char *richSource; /* source bytes for a rich cursor */ } rfbCursor, *rfbCursorPtr; -extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/); +extern Bool rfbSendtqCursorShape(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); -extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString); +extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString); extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString); extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h index cd619dff..70ad2a1a 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 - * alignment of protocol structures. + * tqalignment 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 alignment. + * affecting tqalignment. */ typedef struct { @@ -306,7 +306,7 @@ typedef struct { /* * Special encoding numbers: * 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels; - * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data; + * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape 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 alignment of 32-bit pixels): + * with tqalignment of 32-bit pixels): */ typedef struct { @@ -442,11 +442,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 mask made up of a number of bits. If the Raw bit is set + * byte, which is a tqmask 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 mask are as + * can be specified in just two bytes. The other bits in the tqmask are as * follows: * * BackgroundSpecified - if set, a pixel value follows which specifies @@ -517,7 +517,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * XCursor encoding. This is a special encoding used to transmit X-style - * cursor shapes from server to clients. Note that for this encoding, + * cursor tqshapes 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 - * shapes from server to clients. It is similar to the XCursor encoding but + * tqshapes 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). @@ -589,10 +589,10 @@ typedef struct { CARD16 imageLength; /* * Followed by an image of the cursor in the client's image format - * 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 + * 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 * pixels and so on. */ } rfbSoftCursorSetImage; diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c index 66cc4ee3..22c9202d 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->enableCursorShapeUpdates = FALSE; + cl->enabletqCursorShapeUpdates = FALSE; cl->useRichCursorEncoding = FALSE; cl->enableLastRectEncoding = FALSE; cl->disableBackground = FALSE; @@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl) cl->preferredEncoding = -1; cl->useCopyRect = FALSE; - cl->enableCursorShapeUpdates = FALSE; + cl->enabletqCursorShapeUpdates = 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->enableCursorShapeUpdates = TRUE; + cl->enabletqCursorShapeUpdates = TRUE; cl->cursorWasChanged = TRUE; } break; @@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl) "%s\n", cl->host); if (cl->enableSoftCursorUpdates) break; - cl->enableCursorShapeUpdates = TRUE; + cl->enabletqCursorShapeUpdates = TRUE; cl->useRichCursorEncoding = TRUE; cl->cursorWasChanged = TRUE; break; @@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl) cl->enableSoftCursorUpdates = TRUE; cl->cursorWasChanged = TRUE; cl->cursorWasMoved = TRUE; - cl->enableCursorShapeUpdates = FALSE; + cl->enabletqCursorShapeUpdates = 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 sendCursorShape = FALSE; + Bool sendtqCursorShape = FALSE; int sendSoftCursorRects = 0; if(cl->screen->displayHook) cl->screen->displayHook(cl); /* - * If this client understands cursor shape updates, cursor should be + * If this client understands cursor tqshape updates, cursor should be * removed from the framebuffer. Otherwise, make sure it's put up. */ - if (cl->enableCursorShapeUpdates) { + if (cl->enabletqCursorShapeUpdates) { if (cl->screen->cursorIsDrawn) { rfbUndrawCursor(cl->screen); } if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged && cl->readyForSetColourMapEntries) - sendCursorShape = TRUE; + sendtqCursorShape = 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) && - !(sendCursorShape || sendSoftCursorRects)) { + !(sendtqCursorShape || 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 - + !!sendCursorShape + sendSoftCursorRects)); + + !!sendtqCursorShape + sendSoftCursorRects)); } else { fu->nRects = 0xFFFF; } cl->ublen = sz_rfbFramebufferUpdateMsg; - if (sendCursorShape) { + if (sendtqCursorShape) { cl->cursorWasChanged = FALSE; - if (!rfbSendCursorShape(cl)) { + if (!rfbSendtqCursorShape(cl)) { sraRgnDestroy(updateRegion); return FALSE; } diff --git a/krfb/libvncserver/stats.c b/krfb/libvncserver/stats.c index 954e6d14..86934011 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 shape updates %d, bytes %d\n", + rfbLog(" cursor tqshape updates %d, bytes %d\n", cl->rfbCursorUpdatesSent, cl->rfbCursorBytesSent); for (i = 0; i < MAX_ENCODINGS; i++) { diff --git a/krfb/libvncserver/tight.c b/krfb/libvncserver/tight.c index 9dd743ac..bef8f825 100644 --- a/krfb/libvncserver/tight.c +++ b/krfb/libvncserver/tight.c @@ -1239,7 +1239,7 @@ EncodeMonoRect##bpp(buf, w, h) \ { \ CARD##bpp *ptr; \ CARD##bpp bg; \ - unsigned int value, mask; \ + unsigned int value, tqmask; \ int aligned_width; \ int x, y, bg_bits; \ \ @@ -1257,27 +1257,27 @@ EncodeMonoRect##bpp(buf, w, h) \ *buf++ = 0; \ continue; \ } \ - mask = 0x80 >> bg_bits; \ - value = mask; \ + tqmask = 0x80 >> bg_bits; \ + value = tqmask; \ for (bg_bits++; bg_bits < 8; bg_bits++) { \ - mask >>= 1; \ + tqmask >>= 1; \ if (*ptr++ != bg) { \ - value |= mask; \ + value |= tqmask; \ } \ } \ *buf++ = (CARD8)value; \ } \ \ - mask = 0x80; \ + tqmask = 0x80; \ value = 0; \ if (x >= w) \ continue; \ \ for (; x < w; x++) { \ if (*ptr++ != bg) { \ - value |= mask; \ + value |= tqmask; \ } \ - mask >>= 1; \ + tqmask >>= 1; \ } \ *buf++ = (CARD8)value; \ } \ diff --git a/krfb/libvncserver/vncev.c b/krfb/libvncserver/vncev.c index ba00f9c8..e2d9bf99 100644 --- a/krfb/libvncserver/vncev.c +++ b/krfb/libvncserver/vncev.c @@ -78,7 +78,7 @@ void doptr(int buttonMask,int x,int y,rfbClientPtr cl) { char buffer[1024]; if(buttonMask) { - sprintf(buffer,"Ptr: mouse button mask 0x%x at %d,%d",buttonMask,x,y); + sprintf(buffer,"Ptr: mouse button tqmask 0x%x at %d,%d",buttonMask,x,y); output(cl->screen,buffer); } diff --git a/krfb/libvncserver/x11vnc.c b/krfb/libvncserver/x11vnc.c index 4e298f4a..47d46ae8 100644 --- a/krfb/libvncserver/x11vnc.c +++ b/krfb/libvncserver/x11vnc.c @@ -263,7 +263,7 @@ int probeX=0,probeY=0; void probeScreen(rfbScreenInfoPtr s,int xscreen) { int i,j,/*pixel,i1,*/j1, - bpp=s->rfbServerFormat.bitsPerPixel/8,/*mask=(1<<bpp)-1,*/ + bpp=s->rfbServerFormat.bitsPerPixel/8,/*tqmask=(1<<bpp)-1,*/ rstride=s->paddedWidthInBytes; XImage* im; //fprintf(stderr,"/%d,%d",probeX,probeY); @@ -433,20 +433,20 @@ int main(int argc,char** argv) } } else { screen->rfbServerFormat.redShift = 0; - if ( framebufferImage->red_mask ) - while ( ! ( framebufferImage->red_mask & (1 << screen->rfbServerFormat.redShift) ) ) + if ( framebufferImage->red_tqmask ) + while ( ! ( framebufferImage->red_tqmask & (1 << screen->rfbServerFormat.redShift) ) ) screen->rfbServerFormat.redShift++; screen->rfbServerFormat.greenShift = 0; - if ( framebufferImage->green_mask ) - while ( ! ( framebufferImage->green_mask & (1 << screen->rfbServerFormat.greenShift) ) ) + if ( framebufferImage->green_tqmask ) + while ( ! ( framebufferImage->green_tqmask & (1 << screen->rfbServerFormat.greenShift) ) ) screen->rfbServerFormat.greenShift++; screen->rfbServerFormat.blueShift = 0; - if ( framebufferImage->blue_mask ) - while ( ! ( framebufferImage->blue_mask & (1 << screen->rfbServerFormat.blueShift) ) ) + if ( framebufferImage->blue_tqmask ) + while ( ! ( framebufferImage->blue_tqmask & (1 << screen->rfbServerFormat.blueShift) ) ) screen->rfbServerFormat.blueShift++; - screen->rfbServerFormat.redMax = framebufferImage->red_mask >> screen->rfbServerFormat.redShift; - screen->rfbServerFormat.greenMax = framebufferImage->green_mask >> screen->rfbServerFormat.greenShift; - screen->rfbServerFormat.blueMax = framebufferImage->blue_mask >> screen->rfbServerFormat.blueShift; + screen->rfbServerFormat.redMax = framebufferImage->red_tqmask >> screen->rfbServerFormat.redShift; + screen->rfbServerFormat.greenMax = framebufferImage->green_tqmask >> screen->rfbServerFormat.greenShift; + screen->rfbServerFormat.blueMax = framebufferImage->blue_tqmask >> screen->rfbServerFormat.blueShift; } backupImage = malloc(screen->height*screen->paddedWidthInBytes); diff --git a/krfb/libvncserver/zlib.c b/krfb/libvncserver/zlib.c index 5661d265..d1b300b0 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 alignment in the output buffer (which is + * requires 4/2/1 byte tqalignment 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/getifaddrs.cpp b/krfb/srvloc/getifaddrs.cpp index 296ca19e..339c599c 100644 --- a/krfb/srvloc/getifaddrs.cpp +++ b/krfb/srvloc/getifaddrs.cpp @@ -53,7 +53,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) struct ifconf ifc; int rq_len; int nifs; -# define RQ_IFS 4 +# define RTQ_IFS 4 if (fd < 0) fd = socket (AF_INET, SOCK_DGRAM, 0); @@ -74,13 +74,13 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) ifc.ifc_len = 0; if (ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0) { - rq_len = RQ_IFS * sizeof (struct ifreq); + rq_len = RTQ_IFS * sizeof (struct ifreq); } else rq_len = ifc.ifc_len; } else - rq_len = RQ_IFS * sizeof (struct ifreq); + rq_len = RTQ_IFS * sizeof (struct ifreq); /* Read all the interfaces out of the kernel. */ while (1) diff --git a/krfb/srvloc/getifaddrs.h b/krfb/srvloc/getifaddrs.h index d0514eca..d169b8e4 100644 --- a/krfb/srvloc/getifaddrs.h +++ b/krfb/srvloc/getifaddrs.h @@ -56,7 +56,7 @@ struct kde_ifaddrs unsigned int ifa_flags; /* Flags as from SIOCGIFFLAGS ioctl. */ struct sockaddr *ifa_addr; /* Network address of this interface. */ - struct sockaddr *ifa_netmask; /* Netmask of this interface. */ + struct sockaddr *ifa_netmask; /* Nettqmask of this interface. */ union { /* At most one of the following two is valid. If the IFF_BROADCAST diff --git a/krfb/srvloc/kinetinterfacewatcher.cpp b/krfb/srvloc/kinetinterfacewatcher.cpp index 1e0fa8e6..1963123d 100644 --- a/krfb/srvloc/kinetinterfacewatcher.cpp +++ b/krfb/srvloc/kinetinterfacewatcher.cpp @@ -39,7 +39,7 @@ public: /* * or all network interfaces. * @param interface the name of the interface to watch (e.g.'eth0') - * or TQString::null to watch all interfaces + * or TQString() to watch all interfaces * @param minInterval the minimum interval between two checks in * seconds. Be careful not to check too often, to * avoid unneccessary wasting of CPU time diff --git a/krfb/srvloc/kinetinterfacewatcher.h b/krfb/srvloc/kinetinterfacewatcher.h index 75d72ef8..d767e597 100644 --- a/krfb/srvloc/kinetinterfacewatcher.h +++ b/krfb/srvloc/kinetinterfacewatcher.h @@ -45,23 +45,24 @@ class KInetInterfaceWatcherPrivate; */ class KInetInterfaceWatcher : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a new KInetInterfaceWatcher. Before you can use it, * you must @ref start() it. * * @param interface the name of the interface to watch (e.g.'eth0') - * or TQString::null to watch all interfaces + * or TQString() to watch all interfaces * @param minInterval the minimum interval between two checks in * seconds. Be careful not to check too often, to * avoid unneccessary wasting of CPU time */ - KInetInterfaceWatcher(const TQString &interface = TQString::null, + KInetInterfaceWatcher(const TQString &interface = TQString(), int minInterval = 60); /** * Returns the name of the interface that is being watched. - * @return the name of the interface, or TQString::null if all + * @return the name of the interface, or TQString() if all * interfaces are watched */ TQString interface() const; @@ -71,14 +72,14 @@ public: * or all network interfaces. When one of them changed. * it emits a @ref changed() signal. * @param interface the name of the interface to watch (e.g.'eth0') - * or TQString::null to watch all interfaces + * or TQString() to watch all interfaces * @param minInterval the minimum interval between two checks in * seconds. Be careful not to check too often, to * avoid unneccessary wasting of CPU time * @see changed() * @see stop() */ - void start(const TQString &interface = TQString::null, + void start(const TQString &interface = TQString(), int minInterval = 60); /** @@ -109,7 +110,7 @@ signals: * address has changed. * * @param interfaceName the name of the interface that is watched, - * by the emitter, or TQString::null if all + * by the emitter, or TQString() if all * interfaces are being watched * @see start() */ diff --git a/krfb/srvloc/kserviceregistry.cpp b/krfb/srvloc/kserviceregistry.cpp index f8ab6b51..eac3ac18 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)").arg(it.key()).arg(it.data()); + s += TQString("(%1=%2)").tqarg(it.key()).tqarg(it.data()); it++; } return registerService(serviceURL, s, lifetime); @@ -140,7 +140,7 @@ TQString KServiceRegistry::encodeAttributeValue(const TQString &value) { SLPFree(n); return r; } - return TQString::null; + return TQString(); } #else diff --git a/krfb/srvloc/kserviceregistry.h b/krfb/srvloc/kserviceregistry.h index 8cd965e6..05e88780 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").arg(kia->nodeName()), + * ksr.registerService(TQString("service:remotedesktop.kde:vnc://%1:0").tqarg(kia->nodeName()), * "(type=shared)"); * delete kia; * </pre> @@ -91,10 +91,10 @@ class KServiceRegistry { /** * Creates a new service registration instance for the given * language. - * @param lang the language as two letter code, or TQString::null for the + * @param lang the language as two letter code, or TQString() for the * system default */ - KServiceRegistry(const TQString &lang = TQString::null); + KServiceRegistry(const TQString &lang = TQString()); virtual ~KServiceRegistry(); /** @@ -133,7 +133,7 @@ class KServiceRegistry { * SA daemon (slpd) is running. */ bool registerService(const TQString &serviceURL, - TQString attributes = TQString::null, + TQString attributes = TQString(), unsigned short lifetime = 0); /** |