diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/tde-config.cpp.cmake | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/tde-config.cpp.cmake')
| -rw-r--r-- | tdecore/tde-config.cpp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 58c6407d8..9fe328509 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -114,12 +114,12 @@ void printResult(const TQString &s) int main(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow"); + TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow"); TDECmdLineArgs::init( argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. - KInstance a("tde-config"); + TDEInstance a("tde-config"); a.setConfigReadOnly(TRUE); (void)KGlobal::dirs(); // trigger the creation (void)KGlobal::config(); |