From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kreadconfig/kreadconfig.cpp | 8 ++++---- kreadconfig/kwriteconfig.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'kreadconfig') diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index 2748e3bfe..5e41137a6 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -1,4 +1,4 @@ -/* Read KConfig() entries - for use in shell scripts. +/* Read TDEConfig() entries - for use in shell scripts. * (c) 2001 Red Hat, Inc. * Programmed by Bernhard Rosenkraenzer * @@ -45,7 +45,7 @@ int main(int argc, char **argv) { TDEAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), "1.0.1", - I18N_NOOP("Read KConfig entries - for use in shell scripts"), + I18N_NOOP("Read TDEConfig entries - for use in shell scripts"), TDEAboutData::License_GPL, "(c) 2001 Red Hat, Inc."); aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "bero@redhat.com"); @@ -67,13 +67,13 @@ int main(int argc, char **argv) TDEInstance inst(&aboutData); TDEGlobal::config(); - KConfig *konfig; + TDEConfig *konfig; bool configMustDeleted = false; if (file.isEmpty()) konfig = TDEGlobal::config(); else { - konfig = new KConfig(file, true, false); + konfig = new TDEConfig(file, true, false); configMustDeleted=true; } konfig->setGroup(group); diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 259c37ffc..9e8d75a1e 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -1,4 +1,4 @@ -/* Write KConfig() entries - for use in shell scripts. +/* Write TDEConfig() entries - for use in shell scripts. * (c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho * Programmed by Lu�s Pedro Coelho * based on kreadconfig by Bernhard Rosenkraenzer @@ -27,7 +27,7 @@ int main(int argc, char **argv) { TDEAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"), "1.0.0", - I18N_NOOP("Write KConfig entries - for use in shell scripts"), + I18N_NOOP("Write TDEConfig entries - for use in shell scripts"), TDEAboutData::License_GPL, "(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho"); aboutData.addAuthor("Lu�s Pedro Coelho", 0, "luis_pedro@netcabo.pt"); @@ -50,14 +50,14 @@ int main(int argc, char **argv) TDEInstance inst(&aboutData); - KConfig *konfig; + TDEConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + konfig = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false); else - konfig = new KConfig(file, false, false); + konfig = new TDEConfig(file, false, false); konfig->setGroup(group); - if ( konfig->getConfigState() != KConfig::ReadWrite || konfig->entryIsImmutable( key ) ) return 2; + if ( konfig->getConfigState() != TDEConfig::ReadWrite || konfig->entryIsImmutable( key ) ) return 2; if(type=="bool") { // For symmetry with kreadconfig we accept a wider range of values as true than Qt -- cgit v1.2.3