Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent d75a83b06b
commit cd05b944a0

@ -21,8 +21,8 @@ Interface::Interface(KNetStats* parent, const TQString& name) : mName(name), mVi
void Interface::update() { void Interface::update() {
bool defaultVisibility = !(mName == "lo" || mName == "sit0"); bool defaultVisibility = !(mName == "lo" || mName == "sit0");
KConfig* cfg = kapp->config(); TDEConfig* cfg = kapp->config();
KConfigGroupSaver groupSaver(cfg, mName); TDEConfigGroupSaver groupSaver(cfg, mName);
bool visible = cfg->readBoolEntry("Monitoring", defaultVisibility); bool visible = cfg->readBoolEntry("Monitoring", defaultVisibility);
if (!visible) if (!visible)
setVisible(false); setVisible(false);

@ -133,10 +133,10 @@ void KNetStats::configCancel() {
} }
void KNetStats::saveConfig(const OptionsMap& options) { void KNetStats::saveConfig(const OptionsMap& options) {
KConfig* cfg = kapp->config(); TDEConfig* cfg = kapp->config();
for(OptionsMap::ConstIterator i = options.begin(); i != options.end(); ++i) { 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(); const KNetStatsView::Options& opt = i.data();
// general // general
cfg->writeEntry("UpdateInterval", opt.mUpdateInterval); cfg->writeEntry("UpdateInterval", opt.mUpdateInterval);

@ -27,7 +27,7 @@
#include "configure.h" #include "configure.h"
class KNetStatsView; class KNetStatsView;
class KConfig; class TDEConfig;
class KPopupMenu; class KPopupMenu;
class KActionCollection; class KActionCollection;

@ -375,8 +375,8 @@ TQString KNetStatsView::getNetmask() {
} }
void KNetStatsView::readOptions( const TQString& name, KNetStatsView::Options* opts, bool defaultVisibility ) { void KNetStatsView::readOptions( const TQString& name, KNetStatsView::Options* opts, bool defaultVisibility ) {
KConfig* cfg = kapp->config(); TDEConfig* cfg = kapp->config();
KConfigGroupSaver groupSaver(cfg, name); TDEConfigGroupSaver groupSaver(cfg, name);
// general // general
opts->mUpdateInterval = cfg->readNumEntry("UpdateInterval", 300); opts->mUpdateInterval = cfg->readNumEntry("UpdateInterval", 300);

Loading…
Cancel
Save