summaryrefslogtreecommitdiffstats
path: root/krdc/rdp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
commitc48e769eb275917717e2b55eb869f7e559293ac8 (patch)
tree8f650b907e21c918b826f854dbe1c8174cc2c0c6 /krdc/rdp
parent8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff)
downloadtdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz
tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'krdc/rdp')
-rw-r--r--krdc/rdp/krdpview.cpp12
-rw-r--r--krdc/rdp/krdpview.h8
2 files changed, 10 insertions, 10 deletions
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 73ea3753..00ebf1a6 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -228,7 +228,7 @@ bool KRdpView::start()
m_container->show();
- m_process = new KProcess(TQT_TQOBJECT(m_container));
+ m_process = new TDEProcess(TQT_TQOBJECT(m_container));
*m_process << "rdesktop";
// Check for fullscreen mode
if ((hp->width() == 0) && (hp->height() == 0)) {
@@ -291,12 +291,12 @@ bool KRdpView::start()
*m_process << "-X" << ("0x" + TQString::number(m_container->winId(), 16));
*m_process << "-a" << TQString::number(hp->colorDepth());
*m_process << (m_host + ":" + TQString::number(m_port));
- connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(processDied(KProcess *)));
- connect(m_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(receivedStderr(KProcess *, char *, int)));
+ connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(processDied(TDEProcess *)));
+ connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
connect(m_container, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(connectionClosed()));
connect(m_container, TQT_SIGNAL(newEmbeddedWindow(WId)), TQT_SLOT(connectionOpened(WId)));
tqDebug("Color depth: %d", hp->colorDepth());
- if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stderr))
+ if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr))
{
KMessageBox::error(0, i18n("Could not start rdesktop; make sure rdesktop is properly installed."),
i18n("rdesktop Failure"));
@@ -357,7 +357,7 @@ void KRdpView::connectionClosed()
m_quitFlag = true;
}
-void KRdpView::processDied(KProcess */*proc*/)
+void KRdpView::processDied(TDEProcess */*proc*/)
{
if(m_status == REMOTE_VIEW_CONNECTING)
{
@@ -371,7 +371,7 @@ void KRdpView::processDied(KProcess */*proc*/)
}
}
-void KRdpView::receivedStderr(KProcess */*proc*/, char *buffer, int /*buflen*/)
+void KRdpView::receivedStderr(TDEProcess */*proc*/, char *buffer, int /*buflen*/)
{
TQString output(buffer);
TQString line;
diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h
index edab5870..46a2cbf9 100644
--- a/krdc/rdp/krdpview.h
+++ b/krdc/rdp/krdpview.h
@@ -28,7 +28,7 @@
#define TCP_PORT_RDP 3389
#define RDP_LOGON_NORMAL 0x33
-class KProcess;
+class TDEProcess;
class KRdpView;
class RdpContainer : public QXEmbed
@@ -103,13 +103,13 @@ class KRdpView : public KRemoteView
bool m_quitFlag; // if set: die
TQString m_clientVersion; // version number returned by rdesktop
RdpContainer *m_container; // container for the rdesktop window
- KProcess *m_process; // rdesktop process
+ TDEProcess *m_process; // rdesktop process
private slots:
void connectionOpened(WId window); // called if rdesktop started
void connectionClosed(); // called if rdesktop quits
- void processDied(KProcess *); // called if rdesktop dies
- void receivedStderr(KProcess *proc, char *buffer, int buflen);
+ void processDied(TDEProcess *); // called if rdesktop dies
+ void receivedStderr(TDEProcess *proc, char *buffer, int buflen);
// catches rdesktop debug output
};