diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /akregator/src/librss | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'akregator/src/librss')
| -rw-r--r-- | akregator/src/librss/loader.cpp | 14 | ||||
| -rw-r--r-- | akregator/src/librss/loader.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 5fad14094..95f75e60d 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -207,12 +207,12 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotExited(KProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotOutput(KProcess *, char *, int))); + connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); - d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); + d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } int OutputRetriever::errorCode() const @@ -220,12 +220,12 @@ int OutputRetriever::errorCode() const return d->lastError; } -void OutputRetriever::slotOutput(KProcess *, char *data, int length) +void OutputRetriever::slotOutput(TDEProcess *, char *data, int length) { d->buffer->writeBlock(data, length); } -void OutputRetriever::slotExited(KProcess *p) +void OutputRetriever::slotExited(TDEProcess *p) { if (!p->normalExit()) d->lastError = p->exitStatus(); diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index dab47f17e..0f463d773 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -21,7 +21,7 @@ namespace KIO { class Job; } -class KProcess; +class TDEProcess; namespace RSS { @@ -194,8 +194,8 @@ namespace RSS virtual void abort() {} private slots: - void slotOutput(KProcess *process, char *data, int length); - void slotExited(KProcess *process); + void slotOutput(TDEProcess *process, char *data, int length); + void slotExited(TDEProcess *process); private: OutputRetriever(const OutputRetriever &other); |