Rename KInstance and KAboutData to avoid conflicts with KDE4

kmymoney2/main.cpp

@@ -95,8 +95,8 @@ int main(int argc, char *argv[])
   if(!feature.isEmpty())
     feature = I18N_NOOP("Compiled with the following settings:\n") + feature;
 
-  KAboutData aboutData( "kmymoney2", I18N_NOOP("KMyMoney"),
+  TDEAboutData aboutData( "kmymoney2", I18N_NOOP("KMyMoney"),
-    VERSION, description, KAboutData::License_GPL,
+    VERSION, description, TDEAboutData::License_GPL,
     "(c) 2000-2009 The KMyMoney development team", feature,
     "http://kmymoney2.sourceforge.net/",
     "kmymoney2-developer@lists.sourceforge.net");

kmymoney2/plugins/kmymoneyplugin.h

@@ -31,8 +31,8 @@
 // KDE Includes
 
 #include <kxmlguiclient.h>
-class KAboutData;
+class TDEAboutData;
-class KInstance;
+class TDEInstance;
 class KAction;
 class KToggleAction;
 

kmymoney2/widgets/kmymoney.widgets

@@ -1,6 +1,6 @@
 [Global]
 Includes=kinstance.h
-Init=new KInstance("kmmwidgets");
+Init=new TDEInstance("kmmwidgets");
 
 [KMyMoneyTitleLabel]