Rename KInstance and KAboutData to avoid conflicts with KDE4

systemsettings/main.cpp

@@ -38,9 +38,9 @@ int main( int argc, char *argv[] )
 {
   KLocale::setMainCatalogue("systemsettings");
 	// About data
-  KAboutData aboutData("systemsettings", I18N_NOOP("System Settings"),
+  TDEAboutData aboutData("systemsettings", I18N_NOOP("System Settings"),
 	  SYSTEM_SETTINGS_VERSION, I18N_NOOP("System Settings"),
-	  KAboutData::License_LGPL, "(c) 2005, Benjamin C. Meyer", 0, 0);
+	  TDEAboutData::License_LGPL, "(c) 2005, Benjamin C. Meyer", 0, 0);
   aboutData.addAuthor("Benjamin C. Meyer", I18N_NOOP("Author & Maintainer"),
 	  "ben+systempreferences@meyerhome.net");
   TDECmdLineArgs::init(argc, argv, &aboutData);

systemsettings/mainwindow.h

@@ -105,7 +105,7 @@ private:
    * against a module with no about data
    * we construct one for him
    **/
-  KAboutData *dummyAbout;
+  TDEAboutData *dummyAbout;
 };
 
 #endif