From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krdc/rdp/krdpview.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'krdc/rdp/krdpview.cpp') diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 2fdbdab8..4462cca3 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -45,8 +45,8 @@ extern KWallet::Wallet *wallet; static KRdpView *krdpview; -RdpContainer::RdpContainer(TQWidget *parent, const char *name, WFlags f) : - QXEmbed(parent, name, f), +RdpContainer::RdpContainer(TQWidget *tqparent, const char *name, WFlags f) : + QXEmbed(tqparent, name, f), m_viewOnly(false) { } @@ -82,12 +82,12 @@ bool RdpContainer::x11Event(XEvent *e) // constructor -KRdpView::KRdpView(TQWidget *parent, const char *name, +KRdpView::KRdpView(TQWidget *tqparent, const char *name, const TQString &host, int port, const TQString &user, const TQString &password, int flags, const TQString &domain, const TQString &shell, const TQString &directory) : - KRemoteView(parent, name, Qt::WResizeNoErase | Qt::WRepaintNoErase | Qt::WStaticContents), + KRemoteView(tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents), m_name(name), m_host(host), m_port(port), @@ -120,13 +120,13 @@ KRdpView::~KRdpView() // returns the size of the framebuffer TQSize KRdpView::framebufferSize() { - return m_container->sizeHint(); + return m_container->tqsizeHint(); } // returns the suggested size -TQSize KRdpView::sizeHint() +TQSize KRdpView::tqsizeHint() { - return maximumSize(); + return tqmaximumSize(); } // start closing the connection @@ -164,12 +164,12 @@ bool KRdpView::editPreferences( HostPrefPtr host ) int wv = hp->width(); int hv = hp->height(); int cd = hp->colorDepth(); - TQString kl = hp->layout(); + TQString kl = hp->tqlayout(); bool kwallet = hp->useKWallet(); // show preferences dialog KDialogBase *dlg = new KDialogBase( 0L, "dlg", true, - i18n( "RDP Host Preferences for %1" ).arg( host->host() ), + i18n( "RDP Host Preferences for %1" ).tqarg( host->host() ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); TQVBox *vbox = dlg->makeVBoxMainWidget(); @@ -209,7 +209,7 @@ bool KRdpView::start() SmartPtr hp, rdpDefaults; bool useKWallet = false; - TQWidget *desktop = TQApplication::desktop(); + TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); if(!rdpAppDataConfigured) { @@ -228,7 +228,7 @@ bool KRdpView::start() m_container->show(); - m_process = new KProcess(m_container); + m_process = new KProcess(TQT_TQOBJECT(m_container)); *m_process << "rdesktop"; // Check for fullscreen mode if ((hp->width() == 0) && (hp->height() == 0)) { @@ -243,7 +243,7 @@ bool KRdpView::start() *m_process << "-g" << (TQString::number(hp->width()) + "x" + TQString::number(hp->height())); } } - *m_process << "-k" << hp->layout(); + *m_process << "-k" << hp->tqlayout(); if(!m_user.isEmpty()) { *m_process << "-u" << m_user; } if(m_password.isEmpty() && useKWallet ) { @@ -303,7 +303,7 @@ bool KRdpView::start() return false; } - setStatus(REMOTE_VIEW_CONNECTING); + settqStatus(REMOTE_VIEW_CONNECTING); return true; } @@ -340,9 +340,9 @@ void KRdpView::setViewOnly(bool s) void KRdpView::connectionOpened(WId /*window*/) { - TQSize size = m_container->sizeHint(); + TQSize size = m_container->tqsizeHint(); - setStatus(REMOTE_VIEW_CONNECTED); + settqStatus(REMOTE_VIEW_CONNECTED); setFixedSize(size); m_container->setFixedSize(size); emit changeSize(size.width(), size.height()); @@ -353,7 +353,7 @@ void KRdpView::connectionOpened(WId /*window*/) void KRdpView::connectionClosed() { emit disconnected(); - setStatus(REMOTE_VIEW_DISCONNECTED); + settqStatus(REMOTE_VIEW_DISCONNECTED); m_quitFlag = true; } @@ -361,7 +361,7 @@ void KRdpView::processDied(KProcess */*proc*/) { if(m_status == REMOTE_VIEW_CONNECTING) { - setStatus(REMOTE_VIEW_DISCONNECTED); + settqStatus(REMOTE_VIEW_DISCONNECTED); if(m_clientVersion.isEmpty()) { KMessageBox::error(0, i18n("Connection attempt to host failed."), -- cgit v1.2.1