diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/clock | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/clock')
| -rw-r--r-- | kcontrol/clock/dtime.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/clock/main.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/clock/main.h | 2 | ||||
| -rw-r--r-- | kcontrol/clock/tzone.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index e291387c0..663b4735e 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -240,7 +240,7 @@ void Dtime::configChanged(){ void Dtime::load() { - KConfig config("kcmclockrc", true, false); + TDEConfig config("kcmclockrc", true, false); config.setGroup("NTP"); timeServerList->insertStringList(TQStringList::split(',', config.readEntry("servers", i18n("Public Time Server (pool.ntp.org),\ @@ -263,7 +263,7 @@ oceania.pool.ntp.org")))); void Dtime::save() { - KConfig config("kcmclockrc", false, false); + TDEConfig config("kcmclockrc", false, false); config.setGroup("NTP"); // Save the order, but don't duplicate! diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 5885c2594..1908e8010 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -40,7 +40,7 @@ typedef KGenericFactory<KclockModule, TQWidget> KlockModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock")) KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KlockModuleFactory::instance(), parent, name) + : TDECModule(KlockModuleFactory::instance(), parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"), diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h index 8e178291a..82e501dfc 100644 --- a/kcontrol/clock/main.h +++ b/kcontrol/clock/main.h @@ -28,7 +28,7 @@ class Tzone; class TQTabWidget; -class KclockModule : public KCModule +class KclockModule : public TDECModule { Q_OBJECT diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 9498a062a..541f0cf83 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -176,7 +176,7 @@ void Tzone::save() //After the KDE 3.2 release, need to add an error message } else - if (!KIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime"))) + if (!TDEIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime"))) KMessageBox::error( 0, i18n("Error setting new timezone."), i18n("Timezone Error")); |