diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:48:06 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:48:06 +0000 |
commit | 47c8a359c5276062c4bc17f0e82410f29081b502 (patch) | |
tree | 2d54a5f60a5b74067632f9ef6df58c2bc38155e6 /krfb/krfb | |
parent | 6f82532777a35e0e60bbd2b290b2e93e646f349b (diff) | |
download | tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.tar.gz tdenetwork-47c8a359c5276062c4bc17f0e82410f29081b502.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krfb/krfb')
-rw-r--r-- | krfb/krfb/configuration.cc | 98 | ||||
-rw-r--r-- | krfb/krfb/configuration.h | 28 | ||||
-rw-r--r-- | krfb/krfb/connectiondialog.cc | 8 | ||||
-rw-r--r-- | krfb/krfb/connectiondialog.h | 4 | ||||
-rw-r--r-- | krfb/krfb/invitation.cc | 34 | ||||
-rw-r--r-- | krfb/krfb/invitation.h | 20 | ||||
-rw-r--r-- | krfb/krfb/invitedialog.cc | 18 | ||||
-rw-r--r-- | krfb/krfb/invitedialog.h | 2 | ||||
-rw-r--r-- | krfb/krfb/krfbifaceimpl.h | 4 | ||||
-rw-r--r-- | krfb/krfb/main.cpp | 66 | ||||
-rw-r--r-- | krfb/krfb/manageinvitations.ui.h | 2 | ||||
-rw-r--r-- | krfb/krfb/personalinvitedialog.cc | 12 | ||||
-rw-r--r-- | krfb/krfb/personalinvitedialog.h | 10 | ||||
-rw-r--r-- | krfb/krfb/rfbcontroller.cc | 82 | ||||
-rw-r--r-- | krfb/krfb/rfbcontroller.h | 40 | ||||
-rw-r--r-- | krfb/krfb/trayicon.cpp | 32 | ||||
-rw-r--r-- | krfb/krfb/trayicon.h | 16 | ||||
-rw-r--r-- | krfb/krfb/xupdatescanner.cc | 6 | ||||
-rw-r--r-- | krfb/krfb/xupdatescanner.h | 8 |
19 files changed, 245 insertions, 245 deletions
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index 75f8c31d..03439b9d 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -26,14 +26,14 @@ #include <ksockaddr.h> #include <kactivelabel.h> -#include <qdatastream.h> +#include <tqdatastream.h> #include <dcopclient.h> #include <dcopref.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <krun.h> @@ -58,29 +58,29 @@ Configuration::Configuration(krfb_mode mode) : connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()", "updateKConfig()", false ); - connect(invMngDlg.newPersonalInvitationButton, SIGNAL(clicked()), - SLOT(showPersonalInvitationDialog())); - connect(invMngDlg.newEmailInvitationButton, SIGNAL(clicked()), SLOT(inviteEmail())); - connect(invMngDlg.deleteOneButton, SIGNAL(clicked()), SLOT(invMngDlgDeleteOnePressed())); - connect(invMngDlg.deleteAllButton, SIGNAL(clicked()), SLOT(invMngDlgDeleteAllPressed())); - invMngDlg.listView->setSelectionMode(QListView::Extended); - invMngDlg.listView->setMinimumSize(QSize(400, 100)); // QTs size is much to small - - connect(&invDlg, SIGNAL(createInviteClicked()), - SLOT(showPersonalInvitationDialog())); - connect(&invDlg, SIGNAL(emailInviteClicked()), - SLOT(inviteEmail())); - connect(&invDlg, SIGNAL(manageInviteClicked()), - SLOT(showManageInvitationsDialog())); - connect(&invDlg, SIGNAL(configureClicked()), - SLOT(showConfigurationModule())); - connect(this, SIGNAL(invitationNumChanged(int)), - &invDlg, SLOT(setInviteCount(int))); - connect(this, SIGNAL(invitationNumChanged(int)), - &invMngDlg, SLOT(listSizeChanged(int))); + connect(invMngDlg.newPersonalInvitationButton, TQT_SIGNAL(clicked()), + TQT_SLOT(showPersonalInvitationDialog())); + connect(invMngDlg.newEmailInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(inviteEmail())); + 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 + + connect(&invDlg, TQT_SIGNAL(createInviteClicked()), + TQT_SLOT(showPersonalInvitationDialog())); + connect(&invDlg, TQT_SIGNAL(emailInviteClicked()), + TQT_SLOT(inviteEmail())); + connect(&invDlg, TQT_SIGNAL(manageInviteClicked()), + TQT_SLOT(showManageInvitationsDialog())); + connect(&invDlg, TQT_SIGNAL(configureClicked()), + TQT_SLOT(showConfigurationModule())); + connect(this, TQT_SIGNAL(invitationNumChanged(int)), + &invDlg, TQT_SLOT(setInviteCount(int))); + connect(this, TQT_SIGNAL(invitationNumChanged(int)), + &invMngDlg, TQT_SLOT(listSizeChanged(int))); emit invitationNumChanged(invitationList.size()); - connect(&refreshTimer, SIGNAL(timeout()), SLOT(refreshTimeout())); + connect(&refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refreshTimeout())); refreshTimer.start(1000*60); } @@ -94,24 +94,24 @@ void Configuration::updateKConfig() } void Configuration::setKInetdEnabled(bool enabled) { - kinetdRef.send("setEnabled", QString("krfb"), enabled); - kinetdRef.send("setEnabled", QString("krfb_httpd"), enabled); + kinetdRef.send("setEnabled", TQString("krfb"), enabled); + kinetdRef.send("setEnabled", TQString("krfb_httpd"), enabled); } -void Configuration::setKInetdEnabled(const QDateTime &date) { - kinetdRef.send("setEnabled", QString("krfb"), date); - kinetdRef.send("setEnabled", QString("krfb_httpd"), date); +void Configuration::setKInetdEnabled(const TQDateTime &date) { + kinetdRef.send("setEnabled", TQString("krfb"), date); + kinetdRef.send("setEnabled", TQString("krfb_httpd"), date); } void Configuration::setKInetdServiceRegistrationEnabled(bool enabled) { kinetdRef.send("setServiceRegistrationEnabled", - QString("krfb"), enabled); + TQString("krfb"), enabled); kinetdRef.send("setServiceRegistrationEnabled", - QString("krfb_httpd"), enabled); + TQString("krfb_httpd"), enabled); } void Configuration::getPortFromKInetd() { - DCOPReply r = kinetdRef.call("port", QString("krfb")); + DCOPReply r = kinetdRef.call("port", TQString("krfb")); if (!r.isValid()) return; // nice error msg here? r.get(portNum); @@ -119,12 +119,12 @@ void Configuration::getPortFromKInetd() { void Configuration::setKInetdPort(int p) { DCOPReply r = kinetdRef.call("setPort", - QString("krfb"), p, 1); + TQString("krfb"), p, 1); // nice error msg here? } -void Configuration::removeInvitation(QValueList<Invitation>::iterator it) { +void Configuration::removeInvitation(TQValueList<Invitation>::iterator it) { invitationList.remove(it); save(); } @@ -139,16 +139,16 @@ void Configuration::doKinetdConf() { return; } - QDateTime lastExpiration; - QValueList<Invitation>::iterator it = invitationList.begin(); + TQDateTime lastExpiration; + TQValueList<Invitation>::iterator it = invitationList.begin(); while (it != invitationList.end()) { Invitation &ix = (*it); - QDateTime t = ix.expirationTime(); + TQDateTime t = ix.expirationTime(); if (t > lastExpiration) lastExpiration = t; it++; } - if (lastExpiration.isNull() || (lastExpiration < QDateTime::currentDateTime())) { + if (lastExpiration.isNull() || (lastExpiration < TQDateTime::currentDateTime())) { setKInetdEnabled(false); portNum = -1; } @@ -213,7 +213,7 @@ void Configuration::saveToKConfig() { void Configuration::saveToDialogs() { invalidateOldInvitations(); - QValueList<Invitation>::iterator it = invitationList.begin(); + TQValueList<Invitation>::iterator it = invitationList.begin(); while (it != invitationList.end()) { Invitation &inv = *(it++); if (!inv.getViewItem()) @@ -242,7 +242,7 @@ Invitation Configuration::createInvitation() { } void Configuration::invalidateOldInvitations() { - QValueList<Invitation>::iterator it = invitationList.begin(); + TQValueList<Invitation>::iterator it = invitationList.begin(); while (it != invitationList.end()) { if (!(*it).isValid()) it = invitationList.remove(it); @@ -259,10 +259,10 @@ void Configuration::refreshTimeout() { emit invitationNumChanged(invitationList.size()); } -QString Configuration::hostname() const +TQString Configuration::hostname() const { KInetSocketAddress *a = KInetInterface::getPublicInetAddress(); - QString hostName; + TQString hostName; if (a) { hostName = a->nodeName(); delete a; @@ -294,11 +294,11 @@ bool Configuration::enableSLP() const { return enableSLPFlag; } -QString Configuration::password() const { +TQString Configuration::password() const { return passwordString; } -QValueList<Invitation> &Configuration::invitations() { +TQValueList<Invitation> &Configuration::invitations() { return invitationList; } @@ -328,7 +328,7 @@ void Configuration::setAllowDesktopControl(bool allowDesktopControl) allowDesktopControlFlag = allowDesktopControl; } -void Configuration::setPassword(QString password) +void Configuration::setPassword(TQString password) { passwordString = password; } @@ -369,7 +369,7 @@ void Configuration::showManageInvitationsDialog() { } void Configuration::invMngDlgDeleteOnePressed() { - QValueList<Invitation>::iterator it = invitationList.begin(); + TQValueList<Invitation>::iterator it = invitationList.begin(); while (it != invitationList.end()) { Invitation &ix = (*it); KListViewItem *iv = ix.getViewItem(); @@ -439,7 +439,7 @@ void Configuration::inviteEmail() { emit invitationNumChanged(invitationList.size()); KApplication *app = KApplication::kApplication(); - app->invokeMailer(QString::null, QString::null, QString::null, + app->invokeMailer(TQString::null, TQString::null, TQString::null, 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" diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h index cec7a2ed..57e03385 100644 --- a/krfb/krfb/configuration.h +++ b/krfb/krfb/configuration.h @@ -26,10 +26,10 @@ #include <dcopref.h> #include <kconfig.h> -#include <qtimer.h> -#include <qobject.h> -#include <qvalidator.h> -#include <qstring.h> +#include <tqtimer.h> +#include <tqobject.h> +#include <tqvalidator.h> +#include <tqstring.h> #include <dcopobject.h> @@ -46,7 +46,7 @@ enum krfb_mode { * standalone-config-dialog and all the invitation dialogs * @author Tim Jansen */ -class Configuration : public QObject, public DCOPObject { +class Configuration : public TQObject, public DCOPObject { K_DCOP Q_OBJECT public: @@ -58,8 +58,8 @@ public: bool allowDesktopControl() const; bool allowUninvitedConnections() const; bool enableSLP() const; - QString password() const; - QString hostname() const; + TQString password() const; + TQString hostname() const; int port() const; int preferredPort() const; bool disableBackground() const; @@ -68,15 +68,15 @@ public: void setAllowUninvited(bool allowUninvited); void setEnableSLP(bool e); void setAskOnConnect(bool askOnConnect); - void setPassword(QString password); + void setPassword(TQString password); void setPreferredPort(int p); void setDisableBackground(bool disable); void setDisableXShm(bool disable); void save(); void update(); - QValueList<Invitation> &invitations(); - void removeInvitation(QValueList<Invitation>::iterator it); + TQValueList<Invitation> &invitations(); + void removeInvitation(TQValueList<Invitation>::iterator it); signals: void invitationFinished(); void invitationNumChanged(int num); @@ -97,7 +97,7 @@ private: Invitation createInvitation(); void closeInvDlg(); void invalidateOldInvitations(); - void setKInetdEnabled(const QDateTime &date); + void setKInetdEnabled(const TQDateTime &date); void setKInetdEnabled(bool enabled); void setKInetdServiceRegistrationEnabled(bool enabled); void getPortFromKInetd(); @@ -109,7 +109,7 @@ private: ManageInvitationsDialog invMngDlg; InviteDialog invDlg; PersonalInviteDialog persInvDlg; - QTimer refreshTimer; + TQTimer refreshTimer; bool askOnConnectFlag; bool allowDesktopControlFlag; @@ -120,8 +120,8 @@ private: DCOPRef kinetdRef; - QString passwordString; - QValueList<Invitation> invitationList; + TQString passwordString; + TQValueList<Invitation> invitationList; bool disableBackgroundFlag; bool disableXShmFlag; diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc index bc9f63c9..d767b5a2 100644 --- a/krfb/krfb/connectiondialog.cc +++ b/krfb/krfb/connectiondialog.cc @@ -20,13 +20,13 @@ #include "connectiondialog.h" #include "connectionwidget.h" -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <kiconloader.h> #include <klocale.h> -ConnectionDialog::ConnectionDialog( QWidget *parent, const char *name ) +ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "New Connection" ), Ok|Cancel, Cancel, true ) { @@ -45,7 +45,7 @@ ConnectionDialog::ConnectionDialog( QWidget *parent, const char *name ) setMainWidget( m_connectWidget ); } -void ConnectionDialog::setRemoteHost( const QString &host ) +void ConnectionDialog::setRemoteHost( const TQString &host ) { m_connectWidget->remoteHost->setText( host ); } diff --git a/krfb/krfb/connectiondialog.h b/krfb/krfb/connectiondialog.h index c110d6db..c5f7e589 100644 --- a/krfb/krfb/connectiondialog.h +++ b/krfb/krfb/connectiondialog.h @@ -29,10 +29,10 @@ class ConnectionDialog : public KDialogBase Q_OBJECT public: - ConnectionDialog( QWidget *parent, const char *name ); + ConnectionDialog( TQWidget *parent, const char *name ); ~ConnectionDialog() {}; - void setRemoteHost( const QString &host ); + void setRemoteHost( const TQString &host ); void setAllowRemoteControl( bool b ); bool allowRemoteControl(); diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc index 75c4758a..e764036c 100644 --- a/krfb/krfb/invitation.cc +++ b/krfb/krfb/invitation.cc @@ -22,18 +22,18 @@ * Function for (en/de)crypting strings for config file, taken from KMail * Author: Stefan Taferner <taferner@alpin.or.at> */ -QString cryptStr(const QString &aStr) { - QString result; +TQString cryptStr(const TQString &aStr) { + TQString result; for (unsigned int i = 0; i < aStr.length(); i++) result += (aStr[i].unicode() < 0x20) ? aStr[i] : - QChar(0x1001F - aStr[i].unicode()); + TQChar(0x1001F - aStr[i].unicode()); return result; } // a random string that doesn't contain i, I, o, O, 1, 0 // based on KApplication::randomString() -static QString readableRandomString(int length) { - QString str; +static TQString readableRandomString(int length) { + TQString str; while (length) { int r = KApplication::random() % 62; @@ -59,8 +59,8 @@ static QString readableRandomString(int length) { Invitation::Invitation() : m_viewItem(0) { m_password = readableRandomString(4)+"-"+readableRandomString(3); - m_creationTime = QDateTime::currentDateTime(); - m_expirationTime = QDateTime::currentDateTime().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(QString("password%1").arg(num), "")); - m_creationTime = config->readDateTimeEntry(QString("creation%1").arg(num)); - m_expirationTime = config->readDateTimeEntry(QString("expiration%1").arg(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,25 +93,25 @@ Invitation &Invitation::operator= (const Invitation&x) { } void Invitation::save(KConfig *config, int num) const { - config->writeEntry(QString("password%1").arg(num), cryptStr(m_password)); - config->writeEntry(QString("creation%1").arg(num), m_creationTime); - config->writeEntry(QString("expiration%1").arg(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); } -QString Invitation::password() const { +TQString Invitation::password() const { return m_password; } -QDateTime Invitation::expirationTime() const { +TQDateTime Invitation::expirationTime() const { return m_expirationTime; } -QDateTime Invitation::creationTime() const { +TQDateTime Invitation::creationTime() const { return m_creationTime; } bool Invitation::isValid() const { - return m_expirationTime > QDateTime::currentDateTime(); + return m_expirationTime > TQDateTime::currentDateTime(); } void Invitation::setViewItem(KListViewItem *i) { diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h index 4f1dd826..fe928d7f 100644 --- a/krfb/krfb/invitation.h +++ b/krfb/krfb/invitation.h @@ -21,14 +21,14 @@ #include <kapplication.h> #include <klistview.h> #include <kconfig.h> -#include <qobject.h> -#include <qstring.h> -#include <qdatetime.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqdatetime.h> const int INVITATION_DURATION = 60*60; -QString cryptStr(const QString &aStr); +TQString cryptStr(const TQString &aStr); class Invitation { public: @@ -38,18 +38,18 @@ public: Invitation(const Invitation &x); Invitation &operator= (const Invitation&x); - QString password() const; - QDateTime expirationTime() const; - QDateTime creationTime() const; + TQString password() const; + TQDateTime expirationTime() const; + TQDateTime creationTime() const; bool isValid() const; void setViewItem(KListViewItem*); KListViewItem* getViewItem() const; void save(KConfig *config, int num) const; private: - QString m_password; - QDateTime m_creationTime; - QDateTime m_expirationTime; + TQString m_password; + TQDateTime m_creationTime; + TQDateTime m_expirationTime; KListViewItem *m_viewItem; }; diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc index fe01083a..f3b202a9 100644 --- a/krfb/krfb/invitedialog.cc +++ b/krfb/krfb/invitedialog.cc @@ -24,10 +24,10 @@ #include <klocale.h> #include <kstdguiitem.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqpushbutton.h> -InviteDialog::InviteDialog( QWidget *parent, const char *name ) +InviteDialog::InviteDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Invitation" ), User1|Close|Help, NoDefault, true ) { @@ -38,12 +38,12 @@ InviteDialog::InviteDialog( QWidget *parent, const char *name ) setButtonGuiItem( User1, KStdGuiItem::configure() ); - connect( m_inviteWidget->btnCreateInvite, SIGNAL( clicked() ), - SIGNAL( createInviteClicked() ) ); - connect( m_inviteWidget->btnEmailInvite, SIGNAL( clicked() ), - SIGNAL( emailInviteClicked() ) ); - connect( m_inviteWidget->btnManageInvite, SIGNAL( clicked() ), - SIGNAL( manageInviteClicked() ) ); + connect( m_inviteWidget->btnCreateInvite, TQT_SIGNAL( clicked() ), + TQT_SIGNAL( createInviteClicked() ) ); + connect( m_inviteWidget->btnEmailInvite, TQT_SIGNAL( clicked() ), + TQT_SIGNAL( emailInviteClicked() ) ); + connect( m_inviteWidget->btnManageInvite, TQT_SIGNAL( clicked() ), + TQT_SIGNAL( manageInviteClicked() ) ); } void InviteDialog::slotUser1() diff --git a/krfb/krfb/invitedialog.h b/krfb/krfb/invitedialog.h index dfb0e0f4..a1de109b 100644 --- a/krfb/krfb/invitedialog.h +++ b/krfb/krfb/invitedialog.h @@ -29,7 +29,7 @@ class InviteDialog : public KDialogBase Q_OBJECT public: - InviteDialog( QWidget *parent, const char *name ); + InviteDialog( TQWidget *parent, const char *name ); ~InviteDialog() {} void enableInviteButton( bool enable ); diff --git a/krfb/krfb/krfbifaceimpl.h b/krfb/krfb/krfbifaceimpl.h index 430a0652..21f3a022 100644 --- a/krfb/krfb/krfbifaceimpl.h +++ b/krfb/krfb/krfbifaceimpl.h @@ -1,11 +1,11 @@ #ifndef __KRFB_IFACE_IMPL_H #define __KRFB_IFACE_IMPL_H -#include <qobject.h> +#include <tqobject.h> #include "rfbcontroller.h" #include "krfbiface.h" -class KRfbIfaceImpl : public QObject, public virtual krfbIface +class KRfbIfaceImpl : public TQObject, public virtual krfbIface { Q_OBJECT private: diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp index 4428e983..0910b9d8 100644 --- a/krfb/krfb/main.cpp +++ b/krfb/krfb/main.cpp @@ -31,10 +31,10 @@ #include <kaboutapplication.h> #include <klocale.h> #include <kmessagebox.h> -#include <qobject.h> -#include <qwindowdefs.h> -#include <qcstring.h> -#include <qdatastream.h> +#include <tqobject.h> +#include <tqwindowdefs.h> +#include <tqcstring.h> +#include <tqdatastream.h> #include <dcopref.h> #include <signal.h> @@ -57,7 +57,7 @@ void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) { DCOPRef ref("kded", "kinetd"); ref.setDCOPClient(KApplication::dcopClient()); - DCOPReply r = ref.call("isInstalled", QString("krfb")); + DCOPReply r = ref.call("isInstalled", TQString("krfb")); if (!r.isValid()) { kinetdAvailable = false; krfbAvailable = false; @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) Configuration *config; KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - QString fdString; + TQString fdString; if (!args->isSet(ARG_KINETD)) { bool kinetdA, krfbA; checkKInetd(kinetdA, krfbA); @@ -145,33 +145,33 @@ int main(int argc, char *argv[]) RFBController controller(config); KRfbIfaceImpl dcopiface(&controller); - QObject::connect(&app, SIGNAL(lastWindowClosed()), // dont show passivepopup - &trayicon, SLOT(prepareQuit())); - QObject::connect(&app, SIGNAL(lastWindowClosed()), - &controller, SLOT(closeConnection())); - - QObject::connect(&trayicon, SIGNAL(showManageInvitations()), - config, SLOT(showManageInvitationsDialog())); - QObject::connect(&trayicon, SIGNAL(enableDesktopControl(bool)), - &controller, SLOT(enableDesktopControl(bool))); - QObject::connect(&trayicon, SIGNAL(diconnectedMessageDisplayed()), - &app, SLOT(quit())); - - QObject::connect(&dcopiface, SIGNAL(exitApp()), - &controller, SLOT(closeConnection())); - QObject::connect(&dcopiface, SIGNAL(exitApp()), - &app, SLOT(quit())); - - QObject::connect(&controller, SIGNAL(sessionRefused()), - &app, SLOT(quit())); - QObject::connect(&controller, SIGNAL(sessionEstablished(QString)), - &trayicon, SLOT(showConnectedMessage(QString))); - QObject::connect(&controller, SIGNAL(sessionFinished()), - &trayicon, SLOT(showDisconnectedMessage())); - QObject::connect(&controller, SIGNAL(desktopControlSettingChanged(bool)), - &trayicon, SLOT(setDesktopControlSetting(bool))); - QObject::connect(&controller, SIGNAL(quitApp()), - &app, SLOT(quit())); + TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), // dont show passivepopup + &trayicon, TQT_SLOT(prepareQuit())); + TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), + &controller, TQT_SLOT(closeConnection())); + + TQObject::connect(&trayicon, TQT_SIGNAL(showManageInvitations()), + config, TQT_SLOT(showManageInvitationsDialog())); + TQObject::connect(&trayicon, TQT_SIGNAL(enableDesktopControl(bool)), + &controller, TQT_SLOT(enableDesktopControl(bool))); + TQObject::connect(&trayicon, TQT_SIGNAL(diconnectedMessageDisplayed()), + &app, TQT_SLOT(quit())); + + TQObject::connect(&dcopiface, TQT_SIGNAL(exitApp()), + &controller, TQT_SLOT(closeConnection())); + TQObject::connect(&dcopiface, TQT_SIGNAL(exitApp()), + &app, TQT_SLOT(quit())); + + TQObject::connect(&controller, TQT_SIGNAL(sessionRefused()), + &app, TQT_SLOT(quit())); + TQObject::connect(&controller, TQT_SIGNAL(sessionEstablished(TQString)), + &trayicon, TQT_SLOT(showConnectedMessage(TQString))); + TQObject::connect(&controller, TQT_SIGNAL(sessionFinished()), + &trayicon, TQT_SLOT(showDisconnectedMessage())); + TQObject::connect(&controller, TQT_SIGNAL(desktopControlSettingChanged(bool)), + &trayicon, TQT_SLOT(setDesktopControlSetting(bool))); + TQObject::connect(&controller, TQT_SIGNAL(quitApp()), + &app, TQT_SLOT(quit())); sigset_t sigs; sigemptyset(&sigs); diff --git a/krfb/krfb/manageinvitations.ui.h b/krfb/krfb/manageinvitations.ui.h index 86c1fa4b..74b7cb97 100644 --- a/krfb/krfb/manageinvitations.ui.h +++ b/krfb/krfb/manageinvitations.ui.h @@ -3,7 +3,7 @@ void ManageInvitationsDialog::listSizeChanged(int i) { } void ManageInvitationsDialog::listSelectionChanged() { - QListViewItem *i = listView->firstChild(); + TQListViewItem *i = listView->firstChild(); while(i) { if (i->isSelected()) { deleteOneButton->setEnabled(true); diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc index 4be1c3de..a5664bcb 100644 --- a/krfb/krfb/personalinvitedialog.cc +++ b/krfb/krfb/personalinvitedialog.cc @@ -20,13 +20,13 @@ #include "personalinvitedialog.h" #include "personalinvitewidget.h" -#include <qlabel.h> +#include <tqlabel.h> #include <kactivelabel.h> #include <kiconloader.h> #include <klocale.h> -PersonalInviteDialog::PersonalInviteDialog( QWidget *parent, const char *name ) +PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Personal Invitation" ), Close, Close, true ) { @@ -37,18 +37,18 @@ PersonalInviteDialog::PersonalInviteDialog( QWidget *parent, const char *name ) setMainWidget( m_inviteWidget ); } -void PersonalInviteDialog::setHost( const QString &host, uint port ) +void PersonalInviteDialog::setHost( const TQString &host, uint port ) { - m_inviteWidget->hostLabel->setText( QString( "%1:%2" ) + m_inviteWidget->hostLabel->setText( TQString( "%1:%2" ) .arg( host ).arg( port ) ); } -void PersonalInviteDialog::setPassword( const QString &passwd ) +void PersonalInviteDialog::setPassword( const TQString &passwd ) { m_inviteWidget->passwordLabel->setText( passwd ); } -void PersonalInviteDialog::setExpiration( const QDateTime &expire ) +void PersonalInviteDialog::setExpiration( const TQDateTime &expire ) { m_inviteWidget->expirationLabel->setText( expire.toString( Qt::LocalDate ) ); } diff --git a/krfb/krfb/personalinvitedialog.h b/krfb/krfb/personalinvitedialog.h index 2951a93b..6f28a33d 100644 --- a/krfb/krfb/personalinvitedialog.h +++ b/krfb/krfb/personalinvitedialog.h @@ -22,19 +22,19 @@ class PersonalInviteWidget; -#include <qdatetime.h> +#include <tqdatetime.h> #include <kdialogbase.h> class PersonalInviteDialog : public KDialogBase { public: - PersonalInviteDialog( QWidget *parent, const char *name ); + PersonalInviteDialog( TQWidget *parent, const char *name ); virtual ~PersonalInviteDialog() {} - void setHost( const QString &host, uint port ); - void setPassword( const QString &passwd ); - void setExpiration( const QDateTime &expire ); + void setHost( const TQString &host, uint port ); + void setPassword( const TQString &passwd ); + void setExpiration( const TQDateTime &expire ); protected: PersonalInviteWidget *m_inviteWidget; diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 29f48278..51516683 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -42,18 +42,18 @@ #include <kmessagebox.h> #include <klocale.h> #include <kextsock.h> -#include <qstring.h> -#include <qcursor.h> -#include <qwindowdefs.h> -#include <qtimer.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qglobal.h> -#include <qlabel.h> -#include <qmutex.h> -#include <qdeepcopy.h> -#include <qclipboard.h> -#include <qdesktopwidget.h> +#include <tqstring.h> +#include <tqcursor.h> +#include <tqwindowdefs.h> +#include <tqtimer.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqglobal.h> +#include <tqlabel.h> +#include <tqmutex.h> +#include <tqdeepcopy.h> +#include <tqclipboard.h> +#include <tqdesktopwidget.h> #include <X11/Xutil.h> #include <X11/extensions/XTest.h> @@ -167,7 +167,7 @@ static void inetdDisconnectHook() static void clipboardHook(char* str,int len, rfbClientPtr) { - self->clipboardToServer(QString::fromUtf8(str, len)); + self->clipboardToServer(TQString::fromUtf8(str, len)); } VNCEvent::~VNCEvent() { @@ -290,7 +290,7 @@ PointerEvent::PointerEvent(int b, int _x, int _y) : } void PointerEvent::exec() { - QDesktopWidget *desktopWidget = QApplication::desktop(); + TQDesktopWidget *desktopWidget = TQApplication::desktop(); int screen = desktopWidget->screenNumber(); if (screen < 0) @@ -307,9 +307,9 @@ void PointerEvent::exec() { } -ClipboardEvent::ClipboardEvent(RFBController *c, const QString &ctext) : +ClipboardEvent::ClipboardEvent(RFBController *c, const TQString &ctext) : controller(c), - text(QDeepCopy<QString>(ctext)) { + text(TQDeepCopy<TQString>(ctext)) { } void ClipboardEvent::exec() { @@ -325,7 +325,7 @@ void ClipboardEvent::exec() { } -KNotifyEvent::KNotifyEvent(const QString &n, const QString &d) : +KNotifyEvent::KNotifyEvent(const TQString &n, const TQString &d) : name(n), desc(d) { } @@ -356,14 +356,14 @@ RFBController::RFBController(Configuration *c) : forcedClose(false) { self = this; - connect(&dialog, SIGNAL(okClicked()), SLOT(dialogAccepted())); - connect(&dialog, SIGNAL(cancelClicked()), SLOT(dialogRefused())); - connect(&initIdleTimer, SIGNAL(timeout()), SLOT(checkAsyncEvents())); - connect(&idleTimer, SIGNAL(timeout()), SLOT(idleSlot())); + connect(&dialog, TQT_SIGNAL(okClicked()), TQT_SLOT(dialogAccepted())); + connect(&dialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(dialogRefused())); + connect(&initIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAsyncEvents())); + connect(&idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleSlot())); - clipboard = QApplication::clipboard(); - connect(clipboard, SIGNAL(selectionChanged()), this, SLOT(selectionChanged())); - connect(clipboard, SIGNAL(dataChanged()), this, SLOT(clipboardChanged())); + clipboard = TQApplication::clipboard(); + connect(clipboard, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); + connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); asyncQueue.setAutoDelete(true); @@ -386,11 +386,11 @@ RFBController::~RFBController() void RFBController::startServer(int inetdFd, bool xtestGrab) { framebufferImage = XGetImage(qt_xdisplay(), - QApplication::desktop()->winId(), + TQApplication::desktop()->winId(), 0, 0, - QApplication::desktop()->width(), - QApplication::desktop()->height(), + TQApplication::desktop()->width(), + TQApplication::desktop()->height(), AllPlanes, ZPixmap); @@ -456,7 +456,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab) passwordChanged(); scanner = new XUpdateScanner(qt_xdisplay(), - QApplication::desktop()->winId(), + TQApplication::desktop()->winId(), (unsigned char*)fb, w, h, server->rfbServerFormat.bitsPerPixel, server->paddedWidthInBytes, @@ -484,7 +484,7 @@ void RFBController::stopServer(bool xtestUngrab) if (xtestUngrab) { disabler.disable = true; - QTimer::singleShot(0, &disabler, SLOT(exec())); + TQTimer::singleShot(0, &disabler, TQT_SLOT(exec())); } } @@ -613,9 +613,9 @@ void RFBController::idleSlot() rfbUndrawCursor(server); - QPtrList<Hint> v; + TQPtrList<Hint> v; v.setAutoDelete(true); - QPoint p = QCursor::pos(); + TQPoint p = TQCursor::pos(); scanner->searchUpdates(v, p.y()); Hint *h; @@ -647,7 +647,7 @@ void RFBController::dialogRefused() emit sessionRefused(); } -bool checkPassword(const QString &p, +bool checkPassword(const TQString &p, unsigned char *ochallenge, const char *response, int len) { @@ -680,7 +680,7 @@ bool RFBController::handleCheckPassword(rfbClientPtr cl, cl->authChallenge, response, len); if (!authd) { - QValueList<Invitation>::iterator it = + TQValueList<Invitation>::iterator it = configuration->invitations().begin(); while (it != configuration->invitations().end()) { if (checkPassword((*it).password(), @@ -719,7 +719,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) int socket = cl->sock; cl->negotiationFinishedHook = negotiationFinishedHook; - QString host, port; + TQString host, port; KSocketAddress *ksa = KExtendedSocket::peerAddress(socket); if (ksa) { hostent *he = 0; @@ -730,7 +730,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) AF_INET); if (he && he->h_name) - host = QString(he->h_name); + host = TQString(he->h_name); else host = ksa->nodeName(); delete ksa; @@ -799,7 +799,7 @@ void RFBController::handlePointerEvent(int button_mask, int x, int y) { } -void RFBController::clipboardToServer(const QString &ctext) { +void RFBController::clipboardToServer(const TQString &ctext) { if (!allowDesktopControl) return; @@ -814,7 +814,7 @@ void RFBController::clipboardChanged() { if (clipboard->ownsClipboard()) return; - QString text = clipboard->text(QClipboard::Clipboard); + TQString text = clipboard->text(QClipboard::Clipboard); // avoid ping-pong between client&server if ((lastClipboardDirection == LAST_SYNC_TO_SERVER) && @@ -825,7 +825,7 @@ void RFBController::clipboardChanged() { lastClipboardDirection = LAST_SYNC_TO_CLIENT; lastClipboardText = text; - QCString ctext = text.utf8(); + TQCString ctext = text.utf8(); rfbSendServerCutText(server, ctext.data(), ctext.length()); } @@ -835,7 +835,7 @@ void RFBController::selectionChanged() { if (clipboard->ownsSelection()) return; - QString text = clipboard->text(QClipboard::Selection); + TQString text = clipboard->text(QClipboard::Selection); // avoid ping-pong between client&server if ((lastClipboardDirection == LAST_SYNC_TO_SERVER) && (lastClipboardText == text)) @@ -845,7 +845,7 @@ void RFBController::selectionChanged() { lastClipboardDirection = LAST_SYNC_TO_CLIENT; lastClipboardText = text; - QCString ctext = text.utf8(); + TQCString ctext = text.utf8(); rfbSendServerCutText(server, ctext.data(), ctext.length()); } @@ -857,7 +857,7 @@ void RFBController::passwordChanged() { server->rfbAuthPasswdData = (void*) (authRequired ? 1 : 0); } -void RFBController::sendKNotifyEvent(const QString &n, const QString &d) +void RFBController::sendKNotifyEvent(const TQString &n, const TQString &d) { asyncMutex.lock(); asyncQueue.append(new KNotifyEvent(n, d)); diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h index 948456f2..c7646d91 100644 --- a/krfb/krfb/rfbcontroller.h +++ b/krfb/krfb/rfbcontroller.h @@ -27,9 +27,9 @@ #include "connectiondialog.h" #include "xupdatescanner.h" #include <ksock.h> -#include <qobject.h> -#include <qtimer.h> -#include <qmutex.h> +#include <tqobject.h> +#include <tqtimer.h> +#include <tqmutex.h> #define HAVE_PTHREADS #include "rfb.h" @@ -89,17 +89,17 @@ public: class ClipboardEvent : public VNCEvent { RFBController *controller; - QString text; + TQString text; public: - ClipboardEvent(RFBController *c, const QString &text); + ClipboardEvent(RFBController *c, const TQString &text); virtual void exec(); }; class KNotifyEvent : public VNCEvent { - QString name; - QString desc; + TQString name; + TQString desc; public: - KNotifyEvent(const QString &n, const QString &d); + KNotifyEvent(const TQString &n, const TQString &d); virtual ~KNotifyEvent(); virtual void exec(); }; @@ -120,7 +120,7 @@ public: * set. * @author Tim Jansen */ -class RFBController : public QObject { +class RFBController : public TQObject { Q_OBJECT friend class SessionEstablishedEvent; @@ -139,7 +139,7 @@ public: void handleKeyEvent(bool down, KeySym keySym); void handlePointerEvent(int button_mask, int x, int y); enum rfbNewClientAction handleNewClient(rfbClientPtr cl); - void clipboardToServer(const QString &text); + void clipboardToServer(const TQString &text); void handleClientGone(); void handleNegotiationFinished(rfbClientPtr cl); int getPort(); @@ -153,7 +153,7 @@ public slots: void enableDesktopControl(bool c); signals: - void sessionEstablished(QString host); + void sessionEstablished(TQString host); void sessionFinished(); void sessionRefused(); void quitApp(); @@ -161,35 +161,35 @@ signals: private: void stopServer(bool xtestUngrab = true); - void sendKNotifyEvent(const QString &name, const QString &desc); + void sendKNotifyEvent(const TQString &name, const TQString &desc); void sendSessionEstablished(); void disableBackground(bool state); - QString remoteIp; + TQString remoteIp; volatile bool allowDesktopControl; - QTimer initIdleTimer; - QTimer idleTimer; + TQTimer initIdleTimer; + TQTimer idleTimer; enum { LAST_SYNC_TO_SERVER, LAST_SYNC_TO_CLIENT } lastClipboardDirection; - QString lastClipboardText; + TQString lastClipboardText; QClipboard *clipboard; Configuration *configuration; XUpdateScanner *scanner; ConnectionDialog dialog; - QString desktopName; + TQString desktopName; rfbScreenInfoPtr server; XImage *framebufferImage; - QMutex asyncMutex; - QPtrList<VNCEvent> asyncQueue; + TQMutex asyncMutex; + TQPtrList<VNCEvent> asyncQueue; bool disableBackgroundPending; // background, as desired by libvncserver bool disableBackgroundState; // real background state @@ -208,7 +208,7 @@ private slots: * Class to call XTestDiscard at idle time (because otherwise * it will not work with QT) */ -class XTestDisabler : public QObject { +class XTestDisabler : public TQObject { Q_OBJECT public: XTestDisabler(); diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index 220ff7c0..f7d2c64a 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "trayicon.h" -#include <qtooltip.h> +#include <tqtooltip.h> #include <kstdaction.h> #include <kapplication.h> #include <klocale.h> @@ -25,19 +25,19 @@ #include <kiconloader.h> #include <kpopupmenu.h> -KPassivePopup2::KPassivePopup2(QWidget *parent) : +KPassivePopup2::KPassivePopup2(TQWidget *parent) : KPassivePopup(parent){ } -void KPassivePopup2::hideEvent( QHideEvent *e ) +void KPassivePopup2::hideEvent( TQHideEvent *e ) { KPassivePopup::hideEvent(e); emit hidden(); } -KPassivePopup2 *KPassivePopup2::message( const QString &caption, const QString &text, - const QPixmap &icon, - QWidget *parent) +KPassivePopup2 *KPassivePopup2::message( const TQString &caption, const TQString &text, + const TQPixmap &icon, + TQWidget *parent) { KPassivePopup2 *pop = new KPassivePopup2( parent); pop->setView( caption, text, icon ); @@ -58,10 +58,10 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : trayIconOpen = loader->loadIcon("eyes-open24", KIcon::User); trayIconClosed = loader->loadIcon("eyes-closed24", KIcon::User); setPixmap(trayIconClosed); - QToolTip::add(this, i18n("Desktop Sharing - connecting")); + TQToolTip::add(this, i18n("Desktop Sharing - connecting")); - manageInvitationsAction = new KAction(i18n("Manage &Invitations"), QString::null, - 0, this, SIGNAL(showManageInvitations()), + manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString::null, + 0, this, TQT_SIGNAL(showManageInvitations()), &actionCollection); manageInvitationsAction->plug(contextMenu()); @@ -71,11 +71,11 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : enableControlAction->setCheckedState(i18n("Disable Remote Control")); enableControlAction->plug(contextMenu()); enableControlAction->setEnabled(false); - connect(enableControlAction, SIGNAL(toggled(bool)), SIGNAL(enableDesktopControl(bool))); + connect(enableControlAction, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(enableDesktopControl(bool))); contextMenu()->insertSeparator(); - aboutAction = KStdAction::aboutApp(this, SLOT(showAbout()), &actionCollection); + aboutAction = KStdAction::aboutApp(this, TQT_SLOT(showAbout()), &actionCollection); aboutAction->plug(contextMenu()); show(); @@ -94,27 +94,27 @@ void TrayIcon::prepareQuit() { -void TrayIcon::showConnectedMessage(QString host) { +void TrayIcon::showConnectedMessage(TQString host) { setPixmap(trayIconOpen); KPassivePopup2::message(i18n("Desktop Sharing"), i18n("The remote user has been authenticated and is now connected."), trayIconOpen, this); - QToolTip::add(this, i18n("Desktop Sharing - connected with %1").arg(host)); + TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").arg(host)); } void TrayIcon::showDisconnectedMessage() { if (quitting) return; - QToolTip::add(this, i18n("Desktop Sharing - disconnected")); + TQToolTip::add(this, i18n("Desktop Sharing - disconnected")); setPixmap(trayIconClosed); KPassivePopup2 *p = KPassivePopup2::message(i18n("Desktop Sharing"), i18n("The remote user has closed the connection."), trayIconClosed, this); - connect(p, SIGNAL(hidden()), this, SIGNAL(diconnectedMessageDisplayed())); + connect(p, TQT_SIGNAL(hidden()), this, TQT_SIGNAL(diconnectedMessageDisplayed())); } void TrayIcon::setDesktopControlSetting(bool b) { @@ -122,7 +122,7 @@ void TrayIcon::setDesktopControlSetting(bool b) { enableControlAction->setChecked(b); } -void TrayIcon::mousePressEvent(QMouseEvent *e) +void TrayIcon::mousePressEvent(TQMouseEvent *e) { if (!rect().contains(e->pos())) return; diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h index 4e586efa..ea4e7132 100644 --- a/krfb/krfb/trayicon.h +++ b/krfb/krfb/trayicon.h @@ -20,7 +20,7 @@ #include "configuration.h" -#include <qwidget.h> +#include <tqwidget.h> #include <kpixmap.h> #include <kaction.h> #include <ksystemtray.h> @@ -31,10 +31,10 @@ class KDialog; class KPassivePopup2 : public KPassivePopup { Q_OBJECT public: - KPassivePopup2(QWidget *parent); - static KPassivePopup2 *message( const QString &caption, const QString &text, - const QPixmap &icon, - QWidget *parent); + KPassivePopup2(TQWidget *parent); + static KPassivePopup2 *message( const TQString &caption, const TQString &text, + const TQPixmap &icon, + TQWidget *parent); signals: void hidden(); @@ -43,7 +43,7 @@ protected: /** * Reimplemented to detect hide events. */ - virtual void hideEvent( QHideEvent *e ); + virtual void hideEvent( TQHideEvent *e ); }; /** @@ -64,12 +64,12 @@ signals: public slots: void prepareQuit(); - void showConnectedMessage(QString host); + void showConnectedMessage(TQString host); void showDisconnectedMessage(); void setDesktopControlSetting(bool); protected: - void mousePressEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); private: diff --git a/krfb/krfb/xupdatescanner.cc b/krfb/krfb/xupdatescanner.cc index b2cd4f85..52519475 100644 --- a/krfb/krfb/xupdatescanner.cc +++ b/krfb/krfb/xupdatescanner.cc @@ -356,7 +356,7 @@ static void printStatistics(Hint &hint) { } void XUpdateScanner::flushHint(int x, int y, int &x0, - Hint &hint, QPtrList<Hint> &hintList) + Hint &hint, TQPtrList<Hint> &hintList) { if (x0 < 0) return; @@ -371,7 +371,7 @@ void XUpdateScanner::flushHint(int x, int y, int &x0, hintList.append(new Hint(hint)); } -void XUpdateScanner::createHints(QPtrList<Hint> &hintList) +void XUpdateScanner::createHints(TQPtrList<Hint> &hintList) { Hint hint; int x0 = -1; @@ -441,7 +441,7 @@ void XUpdateScanner::testScanline(int y, bool rememberHits) { recentHitScanlines[MAX_RECENT_HITS-1] = y; } -void XUpdateScanner::searchUpdates(QPtrList<Hint> &hintList, int ptrY) +void XUpdateScanner::searchUpdates(TQPtrList<Hint> &hintList, int ptrY) { count++; count %= SCANLINES; diff --git a/krfb/krfb/xupdatescanner.h b/krfb/krfb/xupdatescanner.h index 00cbec82..fdd02e30 100644 --- a/krfb/krfb/xupdatescanner.h +++ b/krfb/krfb/xupdatescanner.h @@ -21,7 +21,7 @@ #ifndef _hexonet_rfb_XUpdateScanner_h_ #define _hexonet_rfb_XUpdateScanner_h_ -#include <qptrlist.h> +#include <tqptrlist.h> #include <X11/Xlib.h> #include <X11/extensions/XShm.h> @@ -76,15 +76,15 @@ class XUpdateScanner // hitList: returns list of changes // ptrY: ptrY: position of the cursor - void searchUpdates( QPtrList<Hint> &hintList, int ptrY); + void searchUpdates( TQPtrList<Hint> &hintList, int ptrY); private: void testScanline(int y, bool rememberHits); bool copyTile(int x, int y, int tx, int ty); void copyAllTiles(); void flushHint(int x, int y, int &x0, Hint &hint, - QPtrList<Hint> &hintList); - void createHints(QPtrList<Hint> &hintList); + TQPtrList<Hint> &hintList); + void createHints(TQPtrList<Hint> &hintList); void addTileToHint(int x, int y, int th, Hint &hint); void createHintFromTile(int x, int y, int th, Hint &hint); |