diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /tdesu | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdesu')
| -rw-r--r-- | tdesu/tdesu/tdesu.cpp | 4 | ||||
| -rw-r--r-- | tdesu/tdesud/tdesud.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 682b39646..167659915 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -97,9 +97,9 @@ int main(int argc, char *argv[]) if (duser && duser[0]) options[3].def = duser; - KAboutData aboutData("tdesu", I18N_NOOP("TDE su"), + TDEAboutData aboutData("tdesu", I18N_NOOP("TDE su"), Version, I18N_NOOP("Runs a program with elevated privileges."), - KAboutData::License_Artistic, + TDEAboutData::License_Artistic, "Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "[email protected]", "http://www.stack.nl/~geertj/"); diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index 7d425e971..49eac9952 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -251,14 +251,14 @@ int main(int argc, char *argv[]) { prctl(PR_SET_DUMPABLE, 0); - KAboutData aboutData("tdesud", I18N_NOOP("TDE su daemon"), + TDEAboutData aboutData("tdesud", I18N_NOOP("TDE su daemon"), Version, I18N_NOOP("Daemon used by tdesu"), - KAboutData::License_Artistic, + TDEAboutData::License_Artistic, "Copyright (c) 1999,2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"), "[email protected]", "http://www.stack.nl/~geertj/"); TDECmdLineArgs::init(argc, argv, &aboutData); - KInstance instance(&aboutData); + TDEInstance instance(&aboutData); // Set core dump size to 0 struct rlimit rlim; |