From cd05b944a0d49ac0c99fdd77566ee7b44b382b7f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:08:42 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/src/interface.cpp | 4 ++-- src/src/knetstats.cpp | 4 ++-- src/src/knetstats.h | 2 +- src/src/knetstatsview.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/src/interface.cpp b/src/src/interface.cpp index 87fe2b5..5a19876 100644 --- a/src/src/interface.cpp +++ b/src/src/interface.cpp @@ -21,8 +21,8 @@ Interface::Interface(KNetStats* parent, const TQString& name) : mName(name), mVi void Interface::update() { bool defaultVisibility = !(mName == "lo" || mName == "sit0"); - KConfig* cfg = kapp->config(); - KConfigGroupSaver groupSaver(cfg, mName); + TDEConfig* cfg = kapp->config(); + TDEConfigGroupSaver groupSaver(cfg, mName); bool visible = cfg->readBoolEntry("Monitoring", defaultVisibility); if (!visible) setVisible(false); diff --git a/src/src/knetstats.cpp b/src/src/knetstats.cpp index b223431..0452bf4 100644 --- a/src/src/knetstats.cpp +++ b/src/src/knetstats.cpp @@ -133,10 +133,10 @@ void KNetStats::configCancel() { } void KNetStats::saveConfig(const OptionsMap& options) { - KConfig* cfg = kapp->config(); + TDEConfig* cfg = kapp->config(); for(OptionsMap::ConstIterator i = options.begin(); i != options.end(); ++i) { - KConfigGroupSaver groupSaver(cfg, i.key()); + TDEConfigGroupSaver groupSaver(cfg, i.key()); const KNetStatsView::Options& opt = i.data(); // general cfg->writeEntry("UpdateInterval", opt.mUpdateInterval); diff --git a/src/src/knetstats.h b/src/src/knetstats.h index d9ab2a9..e119406 100644 --- a/src/src/knetstats.h +++ b/src/src/knetstats.h @@ -27,7 +27,7 @@ #include "configure.h" class KNetStatsView; -class KConfig; +class TDEConfig; class KPopupMenu; class KActionCollection; diff --git a/src/src/knetstatsview.cpp b/src/src/knetstatsview.cpp index af3f9a8..eb9d276 100644 --- a/src/src/knetstatsview.cpp +++ b/src/src/knetstatsview.cpp @@ -375,8 +375,8 @@ TQString KNetStatsView::getNetmask() { } void KNetStatsView::readOptions( const TQString& name, KNetStatsView::Options* opts, bool defaultVisibility ) { - KConfig* cfg = kapp->config(); - KConfigGroupSaver groupSaver(cfg, name); + TDEConfig* cfg = kapp->config(); + TDEConfigGroupSaver groupSaver(cfg, name); // general opts->mUpdateInterval = cfg->readNumEntry("UpdateInterval", 300); -- cgit v1.2.1