diff options
Diffstat (limited to 'akregator/src/librss')
-rw-r--r-- | akregator/src/librss/article.h | 2 | ||||
-rw-r--r-- | akregator/src/librss/category.h | 2 | ||||
-rw-r--r-- | akregator/src/librss/document.h | 2 | ||||
-rw-r--r-- | akregator/src/librss/enclosure.h | 2 | ||||
-rw-r--r-- | akregator/src/librss/image.cpp | 6 | ||||
-rw-r--r-- | akregator/src/librss/image.h | 4 | ||||
-rw-r--r-- | akregator/src/librss/loader.cpp | 26 | ||||
-rw-r--r-- | akregator/src/librss/loader.h | 18 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.cpp | 4 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.h | 2 |
10 files changed, 34 insertions, 34 deletions
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index c27fdfe7..574f4840 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -34,7 +34,7 @@ namespace RSS * is via Document::articles(). * @see Document::articles() */ - class KDE_EXPORT Article + class TDE_EXPORT Article { public: /** diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 0c40e418..c38a1c4e 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Category + class TDE_EXPORT Category { public: diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 8d098e7d..b876caf2 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -28,7 +28,7 @@ namespace RSS * but rather use Loader::loadFrom() to produce a Document object. * @see Loader::loadForm() */ - class KDE_EXPORT Document + class TDE_EXPORT Document { public: /** diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index 154f8bc0..54ee2059 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -33,7 +33,7 @@ class TQString; namespace RSS { - class KDE_EXPORT Enclosure + class TDE_EXPORT Enclosure { public: diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 174a105b..65aaf539 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -112,9 +112,9 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); d->job = TDEIO::get(d->url, false, false); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } void Image::slotData(TDEIO::Job *, const TQByteArray &data) diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index 299b4292..d98a59fc 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -31,9 +31,9 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class KDE_EXPORT Image : public TQObject + class TDE_EXPORT Image : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 8e2967b7..5cc6aa22 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -111,13 +111,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job->addMetaData("UserAgent", ua); - TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout())); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - 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))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index ed22da22..ce93fc25 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -32,9 +32,9 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class KDE_EXPORT DataRetriever : public TQObject + class TDE_EXPORT DataRetriever : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -87,9 +87,9 @@ namespace RSS * Implements a file retriever, to be used with Loader::loadFrom(). * @see DataRetriever, Loader::loadFrom() */ - class KDE_EXPORT FileRetriever : public DataRetriever + class TDE_EXPORT FileRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -161,7 +161,7 @@ namespace RSS */ class OutputRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -211,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -254,9 +254,9 @@ namespace RSS * loadingComplete signal goes out of scope. This is e.g. the case if you * intend to call getPixmap() on Document::image()! */ - class KDE_EXPORT Loader : public TQObject + class TDE_EXPORT Loader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index bef989c6..4515cf7e 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index 222943a6..2a918a5b 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -14,7 +14,7 @@ using RSS::Status; class Tester : public TQObject { - Q_OBJECT + TQ_OBJECT public: void test( const TQString &url ); |