summaryrefslogtreecommitdiffstats
path: root/akregator/src/librss
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /akregator/src/librss
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'akregator/src/librss')
-rw-r--r--akregator/src/librss/image.cpp14
-rw-r--r--akregator/src/librss/image.h6
-rw-r--r--akregator/src/librss/loader.cpp22
-rw-r--r--akregator/src/librss/loader.h8
4 files changed, 25 insertions, 25 deletions
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index cb8d7c86b..4dff98227 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -32,7 +32,7 @@ struct Image::Private : public Shared
unsigned int height;
unsigned int width;
TQBuffer *pixmapBuffer;
- KIO::Job *job;
+ TDEIO::Job *job;
};
Image::Image() : TQObject(), d(new Private)
@@ -111,18 +111,18 @@ void Image::getPixmap()
d->pixmapBuffer = new TQBuffer;
d->pixmapBuffer->open(IO_WriteOnly);
- d->job = KIO::get(d->url, false, false);
- connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
- connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
+ 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 *)));
}
-void Image::slotData(KIO::Job *, const TQByteArray &data)
+void Image::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->pixmapBuffer->writeBlock(data.data(), data.size());
}
-void Image::slotResult(KIO::Job *job)
+void Image::slotResult(TDEIO::Job *job)
{
TQPixmap pixmap;
if (!job->error())
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index 350253b48..ab0cf6879 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -17,7 +17,7 @@
class TQDomNode;
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -161,8 +161,8 @@ namespace RSS
void gotPixmap(const TQPixmap &pixmap);
private slots:
- void slotData(KIO::Job *job, const TQByteArray &data);
- void slotResult(KIO::Job *job);
+ void slotData(TDEIO::Job *job, const TQByteArray &data);
+ void slotResult(TDEIO::Job *job);
private:
struct Private;
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 95f75e60d..12036ec97 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -52,7 +52,7 @@ class FileRetriever::Private
TQBuffer *buffer;
int lastError;
- KIO::Job *job;
+ TDEIO::Job *job;
static KStaticDeleter<TQString> userAgentsd;
static TQString* userAgent;
};
@@ -103,7 +103,7 @@ void FileRetriever::retrieveData(const KURL &url)
if (u.protocol()=="feed")
u.setProtocol("http");
- d->job = KIO::get(u, false, false);
+ d->job = TDEIO::get(u, false, false);
d->job->addMetaData("cache", m_useCache ? "refresh" : "reload");
TQString ua = userAgent();
@@ -113,11 +113,11 @@ void FileRetriever::retrieveData(const KURL &url)
TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
- connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
- connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
- connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
- TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
+ 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 &)));
}
void FileRetriever::slotTimeout()
@@ -127,7 +127,7 @@ void FileRetriever::slotTimeout()
delete d->buffer;
d->buffer = NULL;
- d->lastError = KIO::ERR_SERVER_TIMEOUT;
+ d->lastError = TDEIO::ERR_SERVER_TIMEOUT;
emit dataRetrieved(TQByteArray(), false);
}
@@ -137,12 +137,12 @@ int FileRetriever::errorCode() const
return d->lastError;
}
-void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
+void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->buffer->writeBlock(data.data(), data.size());
}
-void FileRetriever::slotResult(KIO::Job *job)
+void FileRetriever::slotResult(TDEIO::Job *job)
{
TQByteArray data = d->buffer->buffer();
data.detach();
@@ -154,7 +154,7 @@ void FileRetriever::slotResult(KIO::Job *job)
emit dataRetrieved(data, d->lastError == 0);
}
-void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
+void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
{
emit permanentRedirection(newUrl);
}
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 0f463d773..a0c9f29dc 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -17,7 +17,7 @@ class KURL;
#include <tqobject.h>
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -139,9 +139,9 @@ namespace RSS
void slotTimeout();
private slots:
- void slotData(KIO::Job *job, const TQByteArray &data);
- void slotResult(KIO::Job *job);
- void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
+ void slotData(TDEIO::Job *job, const TQByteArray &data);
+ void slotResult(TDEIO::Job *job);
+ void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
const KURL &toUrl);
private: