diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kded/kded.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kded/kded.cpp')
| -rw-r--r-- | kded/kded.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kded/kded.cpp b/kded/kded.cpp index 538cfff09..84db43b46 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -872,7 +872,7 @@ public: extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { - KAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"), + TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"), "$Id$", I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed")); @@ -904,7 +904,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) } } - KInstance *instance = new KInstance(&aboutData); + TDEInstance *instance = new TDEInstance(&aboutData); KConfig *config = instance->config(); // Enable translations. if (args->isSet("check")) |