summaryrefslogtreecommitdiffstats
path: root/kreadconfig
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kreadconfig
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kreadconfig')
-rw-r--r--kreadconfig/kreadconfig.cpp6
-rw-r--r--kreadconfig/kwriteconfig.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp
index 1748b654..4be41cce 100644
--- a/kreadconfig/kreadconfig.cpp
+++ b/kreadconfig/kreadconfig.cpp
@@ -43,10 +43,10 @@ static KCmdLineOptions options[] =
};
int main(int argc, char **argv)
{
- KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"),
+ TDEAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"),
"1.0.1",
I18N_NOOP("Read KConfig entries - for use in shell scripts"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"(c) 2001 Red Hat, Inc.");
aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "bero@redhat.com");
TDECmdLineArgs::init(argc, argv, &aboutData);
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
return 1;
}
- KInstance inst(&aboutData);
+ TDEInstance inst(&aboutData);
KGlobal::config();
KConfig *konfig;
diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp
index b216a14d..259c37ff 100644
--- a/kreadconfig/kwriteconfig.cpp
+++ b/kreadconfig/kwriteconfig.cpp
@@ -25,10 +25,10 @@ static KCmdLineOptions options[] =
};
int main(int argc, char **argv)
{
- KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"),
+ TDEAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"),
"1.0.0",
I18N_NOOP("Write KConfig entries - for use in shell scripts"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho");
aboutData.addAuthor("Lu�s Pedro Coelho", 0, "luis_pedro@netcabo.pt");
aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "bero@redhat.com");
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
}
TQCString value = args->arg( 0 );
- KInstance inst(&aboutData);
+ TDEInstance inst(&aboutData);
KConfig *konfig;
if (file.isEmpty())