diff options
Diffstat (limited to 'krfb/krfb')
-rw-r--r-- | krfb/krfb/configuration.cc | 20 | ||||
-rw-r--r-- | krfb/krfb/connectionwidget.ui | 10 | ||||
-rw-r--r-- | krfb/krfb/invitation.cc | 22 | ||||
-rw-r--r-- | krfb/krfb/invitedialog.cc | 2 | ||||
-rw-r--r-- | krfb/krfb/invitewidget.ui | 14 | ||||
-rw-r--r-- | krfb/krfb/manageinvitations.ui | 4 | ||||
-rw-r--r-- | krfb/krfb/personalinvitedialog.cc | 2 | ||||
-rw-r--r-- | krfb/krfb/personalinvitewidget.ui | 8 | ||||
-rw-r--r-- | krfb/krfb/rfbcontroller.cc | 24 | ||||
-rw-r--r-- | krfb/krfb/trayicon.cpp | 2 |
10 files changed, 54 insertions, 54 deletions
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 (<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 (<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 (<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() { |