diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:53:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:53:39 -0600 |
| commit | a0fba4eb69210d636bb6d8de82f37866ba953222 (patch) | |
| tree | d29ac4e17f824797b7e63dc716cb204172f52354 | |
| parent | a680d06502ef1c1185885d72f7a44a4da5a1e599 (diff) | |
| download | kmymoney-a0fba4eb69210d636bb6d8de82f37866ba953222.tar.gz kmymoney-a0fba4eb69210d636bb6d8de82f37866ba953222.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | kmymoney2/main.cpp | 4 | ||||
| -rw-r--r-- | kmymoney2/plugins/kmymoneyplugin.h | 4 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoney.widgets | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp index d171acf..4896a57 100644 --- a/kmymoney2/main.cpp +++ b/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"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kmymoney2", I18N_NOOP("KMyMoney"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2000-2009 The KMyMoney development team", feature, "http://kmymoney2.sourceforge.net/", "kmymoney2-developer@lists.sourceforge.net"); diff --git a/kmymoney2/plugins/kmymoneyplugin.h b/kmymoney2/plugins/kmymoneyplugin.h index f6f4230..d0ca4b6 100644 --- a/kmymoney2/plugins/kmymoneyplugin.h +++ b/kmymoney2/plugins/kmymoneyplugin.h @@ -31,8 +31,8 @@ // KDE Includes #include <kxmlguiclient.h> -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class KAction; class KToggleAction; diff --git a/kmymoney2/widgets/kmymoney.widgets b/kmymoney2/widgets/kmymoney.widgets index 7df4bdb..e3f7083 100644 --- a/kmymoney2/widgets/kmymoney.widgets +++ b/kmymoney2/widgets/kmymoney.widgets @@ -1,6 +1,6 @@ [Global] Includes=kinstance.h -Init=new KInstance("kmmwidgets"); +Init=new TDEInstance("kmmwidgets"); [KMyMoneyTitleLabel] |