diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/protocols/winpopup/libwinpopup | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/winpopup/libwinpopup')
-rw-r--r-- | kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp | 14 | ||||
-rw-r--r-- | kopete/protocols/winpopup/libwinpopup/libwinpopup.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index c408d0ad..05eabee7 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -163,9 +163,9 @@ void WinPopupLib::startReadProcess(const TQString &Host) *reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-"; connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *))); - connect(reader, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotReadProcessExited(KProcess *))); + connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *))); - if (!reader->start(KProcess::NotifyOnExit, true)) { + if (!reader->start(TDEProcess::NotifyOnExit, true)) { // still to come kdDebug(14170) << "ReadProcess not started!" << endl; } @@ -189,7 +189,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r) } } -void WinPopupLib::slotReadProcessExited(KProcess *r) +void WinPopupLib::slotReadProcessExited(TDEProcess *r) { delete r; @@ -327,13 +327,13 @@ void WinPopupLib::readMessages(const KFileItemList &items) */ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) { - KProcess *sender = new KProcess(this); + TDEProcess *sender = new TDEProcess(this); *sender << smbClientBin << "-M" << Destination; *sender << "-N" << "-"; - connect(sender, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendProcessExited(KProcess *))); + connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *))); - if (sender->start(KProcess::NotifyOnExit, KProcess::Stdin)) { + if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) { sender->writeStdin(Body.local8Bit(), Body.local8Bit().length()); if (!sender->closeStdin()) { delete sender; @@ -343,7 +343,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) } } -void WinPopupLib::slotSendProcessExited(KProcess *p) +void WinPopupLib::slotSendProcessExited(TDEProcess *p) { // emit sendJobDone(p->pid()); delete p; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index c4789ebc..1213b3cf 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -77,8 +77,8 @@ private slots: void slotUpdateGroupData(); void startReadProcess(const TQString &Host); void slotReadProcessReady(KProcIO *r); - void slotReadProcessExited(KProcess *r); - void slotSendProcessExited(KProcess *p); + void slotReadProcessExited(TDEProcess *r); + void slotSendProcessExited(TDEProcess *p); void slotStartDirLister(); void slotListCompleted(); void slotNewMessages(const KFileItemList &items); |