diff options
Diffstat (limited to 'libkonq/favicons/favicons.cpp')
| -rw-r--r-- | libkonq/favicons/favicons.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index 05bddec1e..d0bde9fc3 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -29,8 +29,8 @@ #include <kdatastream.h> // DO NOT REMOVE, otherwise bool marshalling breaks #include <kicontheme.h> #include <kimageio.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdeio/job.h> #include "favicons.moc" @@ -47,7 +47,7 @@ struct FaviconsModulePrivate }; TQMap<TDEIO::Job *, DownloadInfo> downloads; TQStringList failedDownloads; - KSimpleConfig *config; + TDESimpleConfig *config; TQPtrList<TDEIO::Job> killJobs; TDEIO::MetaData metaData; TQString faviconsDir; @@ -66,7 +66,7 @@ FaviconsModule::FaviconsModule(const TQCString &obj) d->metaData.insert("UseCache", "false"); d->metaData.insert("cookies", "none"); d->metaData.insert("no-auth", "true"); - d->config = new KSimpleConfig(locateLocal("data", "konqueror/faviconrc")); + d->config = new TDESimpleConfig(locateLocal("data", "konqueror/faviconrc")); d->killJobs.setAutoDelete(true); d->faviconsCache.setAutoDelete(true); } @@ -186,9 +186,9 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const TDEIO::Job *job = TDEIO::get(iconURL, false, false); job->addMetaData(d->metaData); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); FaviconsModulePrivate::DownloadInfo download; download.hostOrURL = hostOrURL; download.isHost = isHost; @@ -202,7 +202,7 @@ void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data) if (oldSize > 0x10000) { d->killJobs.append(job); - TQTimer::singleShot(0, this, TQT_SLOT(slotKill())); + TQTimer::singleShot(0, this, TQ_SLOT(slotKill())); } download.iconData.resize(oldSize + data.size()); memcpy(download.iconData.data() + oldSize, data.data(), data.size()); @@ -219,7 +219,7 @@ void FaviconsModule::slotResult(TDEIO::Job *job) TQBuffer buffer(download.iconData); buffer.open(IO_ReadOnly); TQImageIO io; - io.setIODevice(TQT_TQIODEVICE(&buffer)); + io.setIODevice(&buffer); io.setParameters("size=16"); // Check here too, the job might have had no error, but the downloaded // file contains just a 404 message sent with a 200 status. @@ -265,7 +265,7 @@ void FaviconsModule::slotKill() } extern "C" { - KDE_EXPORT KDEDModule *create_favicons(const TQCString &obj) + TDE_EXPORT KDEDModule *create_favicons(const TQCString &obj) { KImageIO::registerFormats(); return new FaviconsModule(obj); |