summaryrefslogtreecommitdiffstats
path: root/kreadconfig
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kreadconfig
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kreadconfig')
-rw-r--r--kreadconfig/kreadconfig.cpp8
-rw-r--r--kreadconfig/kwriteconfig.cpp12
2 files changed, 10 insertions, 10 deletions
diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp
index 2748e3bf..5e41137a 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 <bero@redhat.com>
*
@@ -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 259c37ff..9e8d75a1 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 <luis_pedro@netcabo.pt>
* based on kreadconfig by Bernhard Rosenkraenzer <bero@redhat.com>
@@ -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