From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- akregator/src/akregator_part.cpp | 24 +++++++++++------------ akregator/src/akregator_part.h | 8 ++++---- akregator/src/akregator_view.cpp | 6 +++--- akregator/src/akregator_view.h | 10 +++++----- akregator/src/articlefilter.cpp | 32 +++++++++++++++--------------- akregator/src/articlefilter.h | 42 ++++++++++++++++++++-------------------- akregator/src/articleviewer.cpp | 4 ++-- akregator/src/configdialog.cpp | 6 +++--- akregator/src/configdialog.h | 6 +++--- akregator/src/frame.cpp | 2 +- akregator/src/librss/image.cpp | 14 +++++++------- akregator/src/librss/image.h | 6 +++--- akregator/src/librss/loader.cpp | 22 ++++++++++----------- akregator/src/librss/loader.h | 8 ++++---- akregator/src/mainwindow.cpp | 4 ++-- akregator/src/mainwindow.h | 6 +++--- akregator/src/pageviewer.cpp | 4 ++-- akregator/src/pageviewer.h | 2 +- akregator/src/viewer.cpp | 6 +++--- akregator/src/viewer.h | 4 ++-- 20 files changed, 108 insertions(+), 108 deletions(-) (limited to 'akregator/src') diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index cab78590a..41632adb9 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -197,7 +197,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); - connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*))); + connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*))); connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed())); // notify the part that this is our internal widget @@ -308,7 +308,7 @@ Part::~Part() delete m_applyFiltersInterceptor; } -void Part::readProperties(KConfig* config) +void Part::readProperties(TDEConfig* config) { m_backedUpList = false; openStandardFeedList(); @@ -317,7 +317,7 @@ void Part::readProperties(KConfig* config) m_view->readProperties(config); } -void Part::saveProperties(KConfig* config) +void Part::saveProperties(TDEConfig* config) { if (m_view) { @@ -619,9 +619,9 @@ void Part::importFile(const KURL& url) { isRemote = true; - if (!KIO::NetAccess::download(url, filename, m_view) ) + if (!TDEIO::NetAccess::download(url, filename, m_view) ) { - KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() ); + KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() ); return; } } @@ -640,7 +640,7 @@ void Part::importFile(const KURL& url) KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error")); if (isRemote) - KIO::NetAccess::removeTempFile(filename); + TDEIO::NetAccess::removeTempFile(filename); } void Part::exportFile(const KURL& url) @@ -680,8 +680,8 @@ void Part::exportFile(const KURL& url) stream << m_view->feedListToOPML().toString() << "\n"; tmpfile.close(); - if (!KIO::NetAccess::upload(tmpfile.name(), url, m_view)) - KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() ); + if (!TDEIO::NetAccess::upload(tmpfile.name(), url, m_view)) + KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() ); } } @@ -780,10 +780,10 @@ void Part::showKNotifyOptions() void Part::showOptions() { - if ( KConfigDialog::showDialog( "settings" ) ) + if ( TDEConfigDialog::showDialog( "settings" ) ) return; - KConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() ); + TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() ); connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotSettingsChanged()) ); @@ -848,10 +848,10 @@ void Part::initFonts() if (Settings::serifFont().isEmpty()) Settings::setSerifFont(fonts[3]); - KConfig* conf = Settings::self()->config(); + TDEConfig* conf = Settings::self()->config(); conf->setGroup("HTML Settings"); - KConfig konq("konquerorrc", true, false); + TDEConfig konq("konquerorrc", true, false); konq.setGroup("HTML Settings"); if (!conf->hasKey("MinimumFontSize")) diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 276fb14c0..68062a0ca 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -38,7 +38,7 @@ class TQDomDocument; class TQTimer; class TDEAboutData; -class KConfig; +class TDEConfig; class KURL; namespace Akregator @@ -117,17 +117,17 @@ namespace Akregator virtual void addFeed(); /** - This method is called when this app is restored. The KConfig + This method is called when this app is restored. The TDEConfig object points to the session management config file that was saved with @ref saveProperties Calls AkregatorView's saveProperties. */ - virtual void readProperties(KConfig* config); + virtual void readProperties(TDEConfig* config); /** This method is called when it is time for the app to save its properties for session management purposes. Calls AkregatorView's readProperties. */ - virtual void saveProperties(KConfig* config); + virtual void saveProperties(TDEConfig* config); /** merges a nested part's GUI into the gui of this part @return true iff merging was successful, i.e. the GUI factory was not NULL */ diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 605ae738b..e1ed5a1dc 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -328,7 +328,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons if ( sp2sizes.count() >= m_articleSplitter->sizes().count() ) m_articleSplitter->setSizes( sp2sizes ); - KConfig *conf = Settings::self()->config(); + TDEConfig *conf = Settings::self()->config(); conf->setGroup("General"); if(!conf->readBoolEntry("Disable Introduction", false)) { @@ -1445,7 +1445,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi) } } -void View::readProperties(KConfig* config) +void View::readProperties(TDEConfig* config) { if (!Settings::resetQuickFilterOnNodeChange()) @@ -1474,7 +1474,7 @@ void View::readProperties(KConfig* config) } } -void View::saveProperties(KConfig* config) +void View::saveProperties(TDEConfig* config) { // save filter settings config->writeEntry("searchLine", m_searchBar->text()); diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 989500084..939b7aa49 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -42,7 +42,7 @@ class TQHBox; class TQToolButton; class TQListViewItem; class KComboBox; -class KConfig; +class TDEConfig; class KFileItem; class KLineEdit; class KListView; @@ -50,7 +50,7 @@ class KListViewItem; class KTabWidget; class Viewer; -namespace KIO { +namespace TDEIO { class Job; } @@ -124,8 +124,8 @@ namespace Akregator { void addFeedToGroup(const TQString& url, const TQString& group); /** session management **/ - virtual void readProperties(KConfig* config); - virtual void saveProperties(KConfig* config); + virtual void readProperties(TDEConfig* config); + virtual void saveProperties(TDEConfig* config); Frame* currentFrame() const { return m_currentFrame; } @@ -136,7 +136,7 @@ namespace Akregator { void setWindowCaption(const TQString&); void setStatusBarText(const TQString&); void setProgress(int); - void signalStarted(KIO::Job*); + void signalStarted(TDEIO::Job*); void signalCompleted(); void signalCanceled(const TQString&); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 080d61e7d..27ecd64e8 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -122,7 +122,7 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj } -void Criterion::writeConfig(KConfig* config) const +void Criterion::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject)); @@ -133,7 +133,7 @@ void Criterion::writeConfig(KConfig* config) const config->writeEntry(TQString::fromLatin1("objectValue"), m_object); } -void Criterion::readConfig(KConfig* config) +void Criterion::readConfig(TDEConfig* config) { m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject"))); m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate"))); @@ -267,7 +267,7 @@ bool ArticleMatcher::matches( const Article &a ) const return true; } -void ArticleMatcher::writeConfig(KConfig* config) const +void ArticleMatcher::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association)); @@ -283,7 +283,7 @@ void ArticleMatcher::writeConfig(KConfig* config) const } } -void ArticleMatcher::readConfig(KConfig* config) +void ArticleMatcher::readConfig(TDEConfig* config) { m_criteria.clear(); m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation"))); @@ -406,13 +406,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0) *this = other; } -void TagMatcher::writeConfig(KConfig* config) const +void TagMatcher::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher")); config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID); } -void TagMatcher::readConfig(KConfig* config) +void TagMatcher::readConfig(TDEConfig* config) { d->tagID = config->readEntry(TQString::fromLatin1("matcherParams")); } @@ -462,13 +462,13 @@ void SetStatusAction::setStatus(int status) m_status = status; } -void SetStatusAction::writeConfig(KConfig* config) const +void SetStatusAction::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction")); config->writeEntry(TQString::fromLatin1("actionParams"), m_status); } -void SetStatusAction::readConfig(KConfig* config) +void SetStatusAction::readConfig(TDEConfig* config) { m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read); } @@ -579,7 +579,7 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const return *(d->matcher) == *(other.d->matcher) && *(d->action) == *(other.d->action) && d->name == other.d->name; } -void ArticleFilterList::writeConfig(KConfig* config) const +void ArticleFilterList::writeConfig(TDEConfig* config) const { config->setGroup(TQString::fromLatin1("Filters")); config->writeEntry(TQString::fromLatin1("count"), count()); @@ -592,7 +592,7 @@ void ArticleFilterList::writeConfig(KConfig* config) const } } -void ArticleFilterList::readConfig(KConfig* config) +void ArticleFilterList::readConfig(TDEConfig* config) { clear(); config->setGroup(TQString::fromLatin1("Filters")); @@ -607,12 +607,12 @@ void ArticleFilterList::readConfig(KConfig* config) } -void AssignTagAction::readConfig(KConfig* config) +void AssignTagAction::readConfig(TDEConfig* config) { m_tagID = config->readEntry(TQString::fromLatin1("actionParams")); } -void AssignTagAction::writeConfig(KConfig* config) const +void AssignTagAction::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction")); config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID); @@ -638,11 +638,11 @@ void AssignTagAction::setTagID(const TQString& tagID) m_tagID = tagID; } -void DeleteAction::readConfig(KConfig* /*config*/) +void DeleteAction::readConfig(TDEConfig* /*config*/) { } -void DeleteAction::writeConfig(KConfig* config) const +void DeleteAction::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction")); } @@ -654,7 +654,7 @@ bool DeleteAction::operator==(const AbstractAction& other) return o != 0; } -void ArticleFilter::readConfig(KConfig* config) +void ArticleFilter::readConfig(TDEConfig* config) { delete d->matcher; d->matcher = 0; @@ -688,7 +688,7 @@ void ArticleFilter::readConfig(KConfig* config) d->action->readConfig(config); } -void ArticleFilter::writeConfig(KConfig* config) const +void ArticleFilter::writeConfig(TDEConfig* config) const { config->writeEntry(TQString::fromLatin1("name"), d->name); config->writeEntry(TQString::fromLatin1("id"), d->id); diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index d0bd00e71..5f1e7af37 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -32,7 +32,7 @@ #include #include -class KConfig; +class TDEConfig; namespace Akregator { @@ -77,8 +77,8 @@ class ArticleFilter ArticleFilter& operator=(const ArticleFilter& other); bool operator==(const ArticleFilter& other) const; - void writeConfig(KConfig* config) const; - void readConfig(KConfig* config); + void writeConfig(TDEConfig* config) const; + void readConfig(TDEConfig* config); private: class ArticleFilterPrivate; @@ -90,8 +90,8 @@ class ArticleFilterList : public TQValueList { public: - void writeConfig(KConfig* config) const; - void readConfig(KConfig* config); + void writeConfig(TDEConfig* config) const; + void readConfig(TDEConfig* config); }; /** Abstract base class for matchers, a matcher just takes an article and checks whether the article matches some criterion or not. @@ -107,8 +107,8 @@ class AbstractMatcher virtual bool matches(const Article& article) const = 0; - virtual void writeConfig(KConfig* config) const = 0; - virtual void readConfig(KConfig* config) = 0; + virtual void writeConfig(TDEConfig* config) const = 0; + virtual void readConfig(TDEConfig* config) = 0; virtual bool operator==(const AbstractMatcher&) const = 0; virtual bool operator!=(const AbstractMatcher &other) const = 0; @@ -129,8 +129,8 @@ class TagMatcher : public AbstractMatcher virtual TagMatcher* clone() const; - virtual void writeConfig(KConfig* config) const; - virtual void readConfig(KConfig* config); + virtual void writeConfig(TDEConfig* config) const; + virtual void readConfig(TDEConfig* config); TagMatcher& operator=(const TagMatcher& other); virtual bool operator==(const AbstractMatcher&) const; @@ -147,8 +147,8 @@ class AbstractAction public: virtual void exec(Article& article) = 0; - virtual void writeConfig(KConfig* config) const = 0; - virtual void readConfig(KConfig* config) = 0; + virtual void writeConfig(TDEConfig* config) const = 0; + virtual void readConfig(TDEConfig* config) = 0; virtual AbstractAction* clone() const = 0; virtual bool operator==(const AbstractAction& other) = 0; @@ -159,8 +159,8 @@ class DeleteAction : public AbstractAction public: virtual void exec(Article& article); - virtual void writeConfig(KConfig* config) const; - virtual void readConfig(KConfig* config); + virtual void writeConfig(TDEConfig* config) const; + virtual void readConfig(TDEConfig* config); virtual DeleteAction* clone() const { return new DeleteAction; } virtual bool operator==(const AbstractAction& other); @@ -176,8 +176,8 @@ class SetStatusAction : public AbstractAction int status() const; void setStatus(int status); - virtual void writeConfig(KConfig* config) const; - virtual void readConfig(KConfig* config); + virtual void writeConfig(TDEConfig* config) const; + virtual void readConfig(TDEConfig* config); virtual SetStatusAction* clone() const { return new SetStatusAction(*this); } virtual bool operator==(const AbstractAction& other); @@ -196,8 +196,8 @@ class AssignTagAction : public AbstractAction const TQString& tagID() const; void setTagID(const TQString& tagID); - virtual void writeConfig(KConfig* config) const; - virtual void readConfig(KConfig* config); + virtual void writeConfig(TDEConfig* config) const; + virtual void readConfig(TDEConfig* config); virtual AssignTagAction* clone() const { return new AssignTagAction(*this); } virtual bool operator==(const AbstractAction& other); @@ -236,8 +236,8 @@ class ArticleMatcher : public AbstractMatcher virtual bool operator!=(const AbstractMatcher &other) const; - virtual void writeConfig(KConfig* config) const; - virtual void readConfig(KConfig* config); + virtual void writeConfig(TDEConfig* config) const; + virtual void readConfig(TDEConfig* config); private: @@ -280,8 +280,8 @@ class Criterion bool satisfiedBy( const Article &article ) const; - virtual void writeConfig(KConfig* config) const; - virtual void readConfig(KConfig* config); + virtual void writeConfig(TDEConfig* config) const; + virtual void readConfig(TDEConfig* config); Subject subject() const; Predicate predicate() const; diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index b9dee41a2..32d931f86 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -484,7 +484,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic //TQString url = article.enclosure().url(); //TQString type = article.enclosure().type(); //int length = article.enclosure().length(); - //TQString lengthStr = KIO::convertSize(length); + //TQString lengthStr = TDEIO::convertSize(length); //text += TQString("
%2 (%3, %4)
").arg(url).arg(url).arg(lengthStr).arg(type); } @@ -744,7 +744,7 @@ void ArticleViewer::urlSelected(const TQString &url, int button, int state, cons { if(url == "config:/disable_introduction") { if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), i18n("Disable"), i18n("Keep Enabled") ) == KMessageBox::Yes) { - KConfig *conf = Settings::self()->config(); + TDEConfig *conf = Settings::self()->config(); conf->setGroup("General"); conf->writeEntry("Disable Introduction", "true"); } diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp index 4c3d43506..b88272b4c 100644 --- a/akregator/src/configdialog.cpp +++ b/akregator/src/configdialog.cpp @@ -41,7 +41,7 @@ namespace Akregator { -ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal) +ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : TDEConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal) { addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings"); addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings"); @@ -57,7 +57,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* void ConfigDialog::updateSettings() { Settings::setArchiveBackend(m_settingsAdvanced->selectedFactory()); - KConfigDialog::updateSettings(); + TDEConfigDialog::updateSettings(); } void ConfigDialog::updateWidgets() @@ -67,7 +67,7 @@ void ConfigDialog::updateWidgets() m_settingsAppearance->slider_mediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize")); m_settingsAppearance->lbl_MinimumFontSize->setDisabled(m_config->isImmutable("MinimumFontSize")); m_settingsAppearance->lbl_MediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize")); - KConfigDialog::updateWidgets(); + TDEConfigDialog::updateWidgets(); } ConfigDialog::~ConfigDialog() {} diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h index a2842c3f5..db2161cb8 100644 --- a/akregator/src/configdialog.h +++ b/akregator/src/configdialog.h @@ -32,13 +32,13 @@ namespace Akregator { class SettingsAdvanced; class SettingsAppearance; -class ConfigDialog : public KConfigDialog +class ConfigDialog : public TDEConfigDialog { Q_OBJECT public: - ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); + ConfigDialog(TQWidget *parent, const char *name, TDEConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); virtual ~ConfigDialog(); @@ -49,7 +49,7 @@ class ConfigDialog : public KConfigDialog virtual void updateWidgets(); private: - KConfigSkeleton* m_config; + TDEConfigSkeleton* m_config; SettingsAdvanced* m_settingsAdvanced; SettingsAppearance* m_settingsAppearance; diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index baa472fd2..14b325220 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -57,7 +57,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (ext) connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) ); - connect(p, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(setStarted())); + connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted())); connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted())); connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&))); connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted())); 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 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 -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: diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 275a7a916..3e5208429 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -163,7 +163,7 @@ void MainWindow::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } -void MainWindow::saveProperties(KConfig* config) +void MainWindow::saveProperties(TDEConfig* config) { if (!m_part) loadPart(); @@ -174,7 +174,7 @@ void MainWindow::saveProperties(KConfig* config) //delete m_part; } -void MainWindow::readProperties(KConfig* config) +void MainWindow::readProperties(TDEConfig* config) { if (!m_part) loadPart(); diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index c076cb330..c7321dbd3 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -102,14 +102,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); /** * Reimplemented to save settings */ diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 4baef48cb..0506906b3 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -144,7 +144,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(slotSetCaption (const TQString &)) ); - connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* ))); + connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); @@ -337,7 +337,7 @@ void PageViewer::addHistoryEntry(const KURL& url) } // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp) -void PageViewer::slotStarted( KIO::Job * ) +void PageViewer::slotStarted( TDEIO::Job * ) { d->stopAction->setEnabled(true); } diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h index 352a5914e..8b4b59e40 100644 --- a/akregator/src/pageviewer.h +++ b/akregator/src/pageviewer.h @@ -63,7 +63,7 @@ namespace Akregator virtual void slotPaletteOrFontChanged(); - void slotStarted(KIO::Job *); + void slotStarted(TDEIO::Job *); void slotCompleted(); void slotCancelled(const TQString &errMsg); void slotBackAboutToShow(); diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 153fb8aec..fa62e128f 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -57,8 +57,8 @@ Viewer::Viewer(TQWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, TQT_SIGNAL(started(KIO::Job *)), - this, TQT_SLOT(slotStarted(KIO::Job *))); + connect( this, TQT_SIGNAL(started(TDEIO::Job *)), + this, TQT_SLOT(slotStarted(TDEIO::Job *))); connect( this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); @@ -256,7 +256,7 @@ void Viewer::slotSaveLinkAs() KParts::BrowserRun::simpleSave(tmp, tmp.fileName()); } -void Viewer::slotStarted(KIO::Job *) +void Viewer::slotStarted(TDEIO::Job *) { widget()->setCursor( waitCursor ); } diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index 41a2250e9..e7e0722db 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -29,7 +29,7 @@ class KURL; -namespace KIO +namespace TDEIO { class MetaData; } @@ -107,7 +107,7 @@ namespace Akregator virtual void slotSaveLinkAs(); /** This changes cursor to wait cursor */ - void slotStarted(KIO::Job *); + void slotStarted(TDEIO::Job *); /** This reverts cursor back to normal one */ void slotCompleted(); -- cgit v1.2.1