Rename KInstance and KAboutData to avoid conflicts with KDE4

microbe/main.cpp

@@ -47,8 +47,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	KAboutData about("microbe", I18N_NOOP("Microbe"), version, description,
-					 KAboutData::License_GPL, "(C) 2004-2005, The KTechlab developers", 0, "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" );
+	TDEAboutData about("microbe", I18N_NOOP("Microbe"), version, description,
+					 TDEAboutData::License_GPL, "(C) 2004-2005, The KTechlab developers", 0, "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" );
 	about.addAuthor( "Daniel Clarke", 0, "daniel.jc@gmail.com" );
 	about.addAuthor( "David Saxton", 0, "david@bluehaze.org" );
     TDECmdLineArgs::init(argc, argv, &about);

src/core/main.cpp

@@ -31,8 +31,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("ktechlab", I18N_NOOP("KTechlab"), version, description,
-					 KAboutData::License_GPL, "(C) 2003-2005, The KTechlab developers", "", "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" );
+    TDEAboutData about("ktechlab", I18N_NOOP("KTechlab"), version, description,
+					 TDEAboutData::License_GPL, "(C) 2003-2005, The KTechlab developers", "", "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" );
     about.addAuthor( "David Saxton", 0, "david@bluehaze.org" );
 	about.addAuthor( "Daniel Clarke", 0, "daniel.jc@gmail.com" );
 	about.addCredit( "Couriousous", "JK flip-flop, asyncronous preset/reset in the D flip-flop." );