Rename KInstance and KAboutData to avoid conflicts with KDE4

4 files changed, 9 insertions, 9 deletions

diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 483578c72..958f38303 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -718,9 +718,9 @@ public:
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
    KLocale::setMainCatalogue("tdelibs");
-   KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
+   TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
                 I18N_NOOP("Rebuilds the system configuration cache."),
-                KAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
+                TDEAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
    d.addAuthor("David Faure", I18N_NOOP("Author"), "[email protected]");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "[email protected]");
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 7148a1e6b..7c73fb226 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -113,9 +113,9 @@ int main(int argc, char **argv)
    "The --highlight option can be used to visually indicate to the user where\n"
    "in the TDE menu a specific application is located.");
    
-   KAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
+   TDEAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
                 description,
-                KAboutData::License_GPL, "(c) 2003 Waldo Bastian");
+                TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "[email protected]");
 
    TDECmdLineArgs::init(argc, argv, &d);
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"))
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 0c1dd1b18..bd0980a2b 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -366,15 +366,15 @@ void KHostName::changeSessionManager()
 int main(int argc, char **argv)
 {
    KLocale::setMainCatalogue("tdelibs");
-   KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
+   TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
                 I18N_NOOP("Informs TDE about a change in hostname"),
-                KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
+                TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "[email protected]");
 
    TDECmdLineArgs::init(argc, argv, &d);
    TDECmdLineArgs::addCmdLineOptions(options);
 
-   KInstance k(&d);
+   TDEInstance k(&d);
 
    KHostName hn;