From 4bb787f41f7cdefac2aac33ef59317b7157302c1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:13 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 6 +++--- kmilo/kmilo_kvaio/kcmkvaio/main.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kmilo/kmilo_kvaio/kcmkvaio') diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index d684d44..ce01438 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KVaioModuleFactory::instance(), parent, name) + : TDECModule(KVaioModuleFactory::instance(), parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmkvaio"), @@ -94,7 +94,7 @@ void KVaioModule::save() DCOPClient mClient; kdDebug() << "KVaioModule: saving." << endl; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setGroup("KVaio"); @@ -131,7 +131,7 @@ void KVaioModule::load() void KVaioModule::load(bool useDefaults) { kdDebug() << "KVaioModule: loading." << endl; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setReadDefaults( useDefaults ); diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index 11e2d31..d40d07d 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -28,7 +28,7 @@ class TQTimer; class KCMKVaioGeneral; -class KVaioModule : public KCModule +class KVaioModule : public TDECModule { Q_OBJECT -- cgit v1.2.3