rpms/kmymoney2/devel kmymoney2-0.8.4-enable_final.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 kmymoney2.spec, 1.13, 1.14 sources, 1.4, 1.5
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon May 22 01:36:08 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23956
Modified Files:
.cvsignore kmymoney2.spec sources
Added Files:
kmymoney2-0.8.4-enable_final.patch
Log Message:
* Sun May 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.4-1
- 0.8.4
kmymoney2-0.8.4-enable_final.patch:
--- NEW FILE kmymoney2-0.8.4-enable_final.patch ---
diff -u -r kmymoney2/dialogs/Makefile.in kmymoney2/dialogs/Makefile.in
--- kmymoney2/dialogs/Makefile.in 2006-05-15 16:21:39.000000000 +0200
+++ kmymoney2/dialogs/Makefile.in 2006-05-19 13:44:31.760305256 +0200
@@ -1282,8 +1282,11 @@
rm -f ksecuritylisteditordecl.cpp
echo '#include <kdialog.h>' > ksecuritylisteditordecl.cpp
echo '#include <klocale.h>' >> ksecuritylisteditordecl.cpp
+ echo '#ifndef KMM_I18N' >> ksecuritylisteditordecl.cpp
+ echo '#define KMM_I18N' >> ksecuritylisteditordecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> ksecuritylisteditordecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> ksecuritylisteditordecl.cpp
+ echo '#endif' >> ksecuritylisteditordecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/ksecuritylisteditordecl.ui; \
$(UIC) -tr ${UIC_TR} -i ksecuritylisteditordecl.h $(srcdir)/ksecuritylisteditordecl.ui > ksecuritylisteditordecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" ksecuritylisteditordecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_ksecuritylisteditordecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> ksecuritylisteditordecl.cpp ;\
@@ -1301,8 +1304,11 @@
rm -f konlinequoteconfigurationdecl.cpp
echo '#include <kdialog.h>' > konlinequoteconfigurationdecl.cpp
echo '#include <klocale.h>' >> konlinequoteconfigurationdecl.cpp
+ echo '#ifndef KMM_I18N' >> konlinequoteconfigurationdecl.cpp
+ echo '#define KMM_I18N' >> konlinequoteconfigurationdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> konlinequoteconfigurationdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> konlinequoteconfigurationdecl.cpp
+ echo '#endif' >> konlinequoteconfigurationdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/konlinequoteconfigurationdecl.ui; \
$(UIC) -tr ${UIC_TR} -i konlinequoteconfigurationdecl.h $(srcdir)/konlinequoteconfigurationdecl.ui > konlinequoteconfigurationdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" konlinequoteconfigurationdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_konlinequoteconfigurationdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> konlinequoteconfigurationdecl.cpp ;\
@@ -1320,8 +1326,11 @@
rm -f kconfirmmanualenterdialog.cpp
echo '#include <kdialog.h>' > kconfirmmanualenterdialog.cpp
echo '#include <klocale.h>' >> kconfirmmanualenterdialog.cpp
+ echo '#ifndef KMM_I18N' >> kconfirmmanualenterdialog.cpp
+ echo '#define KMM_I18N' >> kconfirmmanualenterdialog.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kconfirmmanualenterdialog.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kconfirmmanualenterdialog.cpp
+ echo '#endif' >> kconfirmmanualenterdialog.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kconfirmmanualenterdialog.ui; \
$(UIC) -tr ${UIC_TR} -i kconfirmmanualenterdialog.h $(srcdir)/kconfirmmanualenterdialog.ui > kconfirmmanualenterdialog.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kconfirmmanualenterdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kconfirmmanualenterdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kconfirmmanualenterdialog.cpp ;\
@@ -1339,8 +1348,11 @@
rm -f knewaccountwizarddecl.cpp
echo '#include <kdialog.h>' > knewaccountwizarddecl.cpp
echo '#include <klocale.h>' >> knewaccountwizarddecl.cpp
+ echo '#ifndef KMM_I18N' >> knewaccountwizarddecl.cpp
+ echo '#define KMM_I18N' >> knewaccountwizarddecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewaccountwizarddecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewaccountwizarddecl.cpp
+ echo '#endif' >> knewaccountwizarddecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewaccountwizarddecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewaccountwizarddecl.h $(srcdir)/knewaccountwizarddecl.ui > knewaccountwizarddecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewaccountwizarddecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewaccountwizarddecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewaccountwizarddecl.cpp ;\
@@ -1358,8 +1370,11 @@
rm -f knewbankdlgdecl.cpp
echo '#include <kdialog.h>' > knewbankdlgdecl.cpp
echo '#include <klocale.h>' >> knewbankdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> knewbankdlgdecl.cpp
+ echo '#define KMM_I18N' >> knewbankdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewbankdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewbankdlgdecl.cpp
+ echo '#endif' >> knewbankdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewbankdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewbankdlgdecl.h $(srcdir)/knewbankdlgdecl.ui > knewbankdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewbankdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewbankdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewbankdlgdecl.cpp ;\
@@ -1377,8 +1392,11 @@
rm -f kcurrencyeditdlgdecl.cpp
echo '#include <kdialog.h>' > kcurrencyeditdlgdecl.cpp
echo '#include <klocale.h>' >> kcurrencyeditdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kcurrencyeditdlgdecl.cpp
+ echo '#define KMM_I18N' >> kcurrencyeditdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcurrencyeditdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcurrencyeditdlgdecl.cpp
+ echo '#endif' >> kcurrencyeditdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kcurrencyeditdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kcurrencyeditdlgdecl.h $(srcdir)/kcurrencyeditdlgdecl.ui > kcurrencyeditdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcurrencyeditdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcurrencyeditdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcurrencyeditdlgdecl.cpp ;\
@@ -1396,8 +1414,11 @@
rm -f mymoneyqifprofileeditordecl.cpp
echo '#include <kdialog.h>' > mymoneyqifprofileeditordecl.cpp
echo '#include <klocale.h>' >> mymoneyqifprofileeditordecl.cpp
+ echo '#ifndef KMM_I18N' >> mymoneyqifprofileeditordecl.cpp
+ echo '#define KMM_I18N' >> mymoneyqifprofileeditordecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> mymoneyqifprofileeditordecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> mymoneyqifprofileeditordecl.cpp
+ echo '#endif' >> mymoneyqifprofileeditordecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/mymoneyqifprofileeditordecl.ui; \
$(UIC) -tr ${UIC_TR} -i mymoneyqifprofileeditordecl.h $(srcdir)/mymoneyqifprofileeditordecl.ui > mymoneyqifprofileeditordecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" mymoneyqifprofileeditordecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_mymoneyqifprofileeditordecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> mymoneyqifprofileeditordecl.cpp ;\
@@ -1415,8 +1436,11 @@
rm -f knewinvestmentwizarddecl.cpp
echo '#include <kdialog.h>' > knewinvestmentwizarddecl.cpp
echo '#include <klocale.h>' >> knewinvestmentwizarddecl.cpp
+ echo '#ifndef KMM_I18N' >> knewinvestmentwizarddecl.cpp
+ echo '#define KMM_I18N' >> knewinvestmentwizarddecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewinvestmentwizarddecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewinvestmentwizarddecl.cpp
+ echo '#endif' >> knewinvestmentwizarddecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewinvestmentwizarddecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewinvestmentwizarddecl.h $(srcdir)/knewinvestmentwizarddecl.ui > knewinvestmentwizarddecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewinvestmentwizarddecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewinvestmentwizarddecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewinvestmentwizarddecl.cpp ;\
@@ -1434,8 +1458,11 @@
rm -f ksplittransactiondlgdecl.cpp
echo '#include <kdialog.h>' > ksplittransactiondlgdecl.cpp
echo '#include <klocale.h>' >> ksplittransactiondlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> ksplittransactiondlgdecl.cpp
+ echo '#define KMM_I18N' >> ksplittransactiondlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> ksplittransactiondlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> ksplittransactiondlgdecl.cpp
+ echo '#endif' >> ksplittransactiondlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/ksplittransactiondlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i ksplittransactiondlgdecl.h $(srcdir)/ksplittransactiondlgdecl.ui > ksplittransactiondlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" ksplittransactiondlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_ksplittransactiondlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> ksplittransactiondlgdecl.cpp ;\
@@ -1453,8 +1480,11 @@
rm -f kchooseimportexportdlgdecl.cpp
echo '#include <kdialog.h>' > kchooseimportexportdlgdecl.cpp
echo '#include <klocale.h>' >> kchooseimportexportdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kchooseimportexportdlgdecl.cpp
+ echo '#define KMM_I18N' >> kchooseimportexportdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kchooseimportexportdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kchooseimportexportdlgdecl.cpp
+ echo '#endif' >> kchooseimportexportdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kchooseimportexportdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kchooseimportexportdlgdecl.h $(srcdir)/kchooseimportexportdlgdecl.ui > kchooseimportexportdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kchooseimportexportdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kchooseimportexportdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kchooseimportexportdlgdecl.cpp ;\
@@ -1472,8 +1502,11 @@
rm -f kexportdlgdecl.cpp
echo '#include <kdialog.h>' > kexportdlgdecl.cpp
echo '#include <klocale.h>' >> kexportdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kexportdlgdecl.cpp
+ echo '#define KMM_I18N' >> kexportdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kexportdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kexportdlgdecl.cpp
+ echo '#endif' >> kexportdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kexportdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kexportdlgdecl.h $(srcdir)/kexportdlgdecl.ui > kexportdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kexportdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kexportdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kexportdlgdecl.cpp ;\
@@ -1491,8 +1524,11 @@
rm -f knewloanwizarddecl.cpp
echo '#include <kdialog.h>' > knewloanwizarddecl.cpp
echo '#include <klocale.h>' >> knewloanwizarddecl.cpp
+ echo '#ifndef KMM_I18N' >> knewloanwizarddecl.cpp
+ echo '#define KMM_I18N' >> knewloanwizarddecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewloanwizarddecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewloanwizarddecl.cpp
+ echo '#endif' >> knewloanwizarddecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewloanwizarddecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewloanwizarddecl.h $(srcdir)/knewloanwizarddecl.ui > knewloanwizarddecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewloanwizarddecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewloanwizarddecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewloanwizarddecl.cpp ;\
@@ -1510,8 +1546,11 @@
rm -f knewfiledlgdecl.cpp
echo '#include <kdialog.h>' > knewfiledlgdecl.cpp
echo '#include <klocale.h>' >> knewfiledlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> knewfiledlgdecl.cpp
+ echo '#define KMM_I18N' >> knewfiledlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewfiledlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewfiledlgdecl.cpp
+ echo '#endif' >> knewfiledlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewfiledlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewfiledlgdecl.h $(srcdir)/knewfiledlgdecl.ui > knewfiledlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewfiledlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewfiledlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewfiledlgdecl.cpp ;\
@@ -1529,8 +1568,11 @@
rm -f kupdatestockpricedlgdecl.cpp
echo '#include <kdialog.h>' > kupdatestockpricedlgdecl.cpp
echo '#include <klocale.h>' >> kupdatestockpricedlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kupdatestockpricedlgdecl.cpp
+ echo '#define KMM_I18N' >> kupdatestockpricedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kupdatestockpricedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kupdatestockpricedlgdecl.cpp
+ echo '#endif' >> kupdatestockpricedlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kupdatestockpricedlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kupdatestockpricedlgdecl.h $(srcdir)/kupdatestockpricedlgdecl.ui > kupdatestockpricedlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kupdatestockpricedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kupdatestockpricedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kupdatestockpricedlgdecl.cpp ;\
@@ -1548,8 +1590,11 @@
rm -f kgncpricesourcedlgdecl.cpp
echo '#include <kdialog.h>' > kgncpricesourcedlgdecl.cpp
echo '#include <klocale.h>' >> kgncpricesourcedlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kgncpricesourcedlgdecl.cpp
+ echo '#define KMM_I18N' >> kgncpricesourcedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kgncpricesourcedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kgncpricesourcedlgdecl.cpp
+ echo '#endif' >> kgncpricesourcedlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kgncpricesourcedlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kgncpricesourcedlgdecl.h $(srcdir)/kgncpricesourcedlgdecl.ui > kgncpricesourcedlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kgncpricesourcedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kgncpricesourcedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kgncpricesourcedlgdecl.cpp ;\
@@ -1567,8 +1612,11 @@
rm -f kreconciledlgdecl.cpp
echo '#include <kdialog.h>' > kreconciledlgdecl.cpp
echo '#include <klocale.h>' >> kreconciledlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kreconciledlgdecl.cpp
+ echo '#define KMM_I18N' >> kreconciledlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kreconciledlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kreconciledlgdecl.cpp
+ echo '#endif' >> kreconciledlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kreconciledlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kreconciledlgdecl.h $(srcdir)/kreconciledlgdecl.ui > kreconciledlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kreconciledlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kreconciledlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kreconciledlgdecl.cpp ;\
@@ -1586,8 +1634,11 @@
rm -f kimportdlgdecl.cpp
echo '#include <kdialog.h>' > kimportdlgdecl.cpp
echo '#include <klocale.h>' >> kimportdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kimportdlgdecl.cpp
+ echo '#define KMM_I18N' >> kimportdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kimportdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kimportdlgdecl.cpp
+ echo '#endif' >> kimportdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kimportdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kimportdlgdecl.h $(srcdir)/kimportdlgdecl.ui > kimportdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kimportdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kimportdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kimportdlgdecl.cpp ;\
@@ -1605,8 +1656,11 @@
rm -f keditschedtransdlgdecl.cpp
echo '#include <kdialog.h>' > keditschedtransdlgdecl.cpp
echo '#include <klocale.h>' >> keditschedtransdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> keditschedtransdlgdecl.cpp
+ echo '#define KMM_I18N' >> keditschedtransdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> keditschedtransdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> keditschedtransdlgdecl.cpp
+ echo '#endif' >> keditschedtransdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/keditschedtransdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i keditschedtransdlgdecl.h $(srcdir)/keditschedtransdlgdecl.ui > keditschedtransdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" keditschedtransdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_keditschedtransdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> keditschedtransdlgdecl.cpp ;\
@@ -1624,8 +1678,11 @@
rm -f kenterscheduledialogdecl.cpp
echo '#include <kdialog.h>' > kenterscheduledialogdecl.cpp
echo '#include <klocale.h>' >> kenterscheduledialogdecl.cpp
+ echo '#ifndef KMM_I18N' >> kenterscheduledialogdecl.cpp
+ echo '#define KMM_I18N' >> kenterscheduledialogdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kenterscheduledialogdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kenterscheduledialogdecl.cpp
+ echo '#endif' >> kenterscheduledialogdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kenterscheduledialogdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kenterscheduledialogdecl.h $(srcdir)/kenterscheduledialogdecl.ui > kenterscheduledialogdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kenterscheduledialogdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kenterscheduledialogdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kenterscheduledialogdecl.cpp ;\
@@ -1643,8 +1700,11 @@
rm -f kaccountselectdlgdecl.cpp
echo '#include <kdialog.h>' > kaccountselectdlgdecl.cpp
echo '#include <klocale.h>' >> kaccountselectdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kaccountselectdlgdecl.cpp
+ echo '#define KMM_I18N' >> kaccountselectdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kaccountselectdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kaccountselectdlgdecl.cpp
+ echo '#endif' >> kaccountselectdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kaccountselectdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kaccountselectdlgdecl.h $(srcdir)/kaccountselectdlgdecl.ui > kaccountselectdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kaccountselectdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kaccountselectdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kaccountselectdlgdecl.cpp ;\
@@ -1662,8 +1722,11 @@
rm -f kbackupdlgdecl.cpp
echo '#include <kdialog.h>' > kbackupdlgdecl.cpp
echo '#include <klocale.h>' >> kbackupdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kbackupdlgdecl.cpp
+ echo '#define KMM_I18N' >> kbackupdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kbackupdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kbackupdlgdecl.cpp
+ echo '#endif' >> kbackupdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kbackupdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kbackupdlgdecl.h $(srcdir)/kbackupdlgdecl.ui > kbackupdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kbackupdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kbackupdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kbackupdlgdecl.cpp ;\
@@ -1681,8 +1744,11 @@
rm -f keditequityentrydecl.cpp
echo '#include <kdialog.h>' > keditequityentrydecl.cpp
echo '#include <klocale.h>' >> keditequityentrydecl.cpp
+ echo '#ifndef KMM_I18N' >> keditequityentrydecl.cpp
+ echo '#define KMM_I18N' >> keditequityentrydecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> keditequityentrydecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> keditequityentrydecl.cpp
+ echo '#endif' >> keditequityentrydecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/keditequityentrydecl.ui; \
$(UIC) -tr ${UIC_TR} -i keditequityentrydecl.h $(srcdir)/keditequityentrydecl.ui > keditequityentrydecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" keditequityentrydecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_keditequityentrydecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> keditequityentrydecl.cpp ;\
@@ -1700,8 +1766,11 @@
rm -f kfindtransactiondlgdecl.cpp
echo '#include <kdialog.h>' > kfindtransactiondlgdecl.cpp
echo '#include <klocale.h>' >> kfindtransactiondlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kfindtransactiondlgdecl.cpp
+ echo '#define KMM_I18N' >> kfindtransactiondlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kfindtransactiondlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kfindtransactiondlgdecl.cpp
+ echo '#endif' >> kfindtransactiondlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kfindtransactiondlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kfindtransactiondlgdecl.h $(srcdir)/kfindtransactiondlgdecl.ui > kfindtransactiondlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kfindtransactiondlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kfindtransactiondlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kfindtransactiondlgdecl.cpp ;\
@@ -1719,8 +1788,11 @@
rm -f knewaccountdlgdecl.cpp
echo '#include <kdialog.h>' > knewaccountdlgdecl.cpp
echo '#include <klocale.h>' >> knewaccountdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> knewaccountdlgdecl.cpp
+ echo '#define KMM_I18N' >> knewaccountdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewaccountdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewaccountdlgdecl.cpp
+ echo '#endif' >> knewaccountdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewaccountdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewaccountdlgdecl.h $(srcdir)/knewaccountdlgdecl.ui > knewaccountdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewaccountdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewaccountdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewaccountdlgdecl.cpp ;\
@@ -1738,8 +1810,11 @@
rm -f kofxdirectconnectdlgdecl.cpp
echo '#include <kdialog.h>' > kofxdirectconnectdlgdecl.cpp
echo '#include <klocale.h>' >> kofxdirectconnectdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kofxdirectconnectdlgdecl.cpp
+ echo '#define KMM_I18N' >> kofxdirectconnectdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kofxdirectconnectdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kofxdirectconnectdlgdecl.cpp
+ echo '#endif' >> kofxdirectconnectdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kofxdirectconnectdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kofxdirectconnectdlgdecl.h $(srcdir)/kofxdirectconnectdlgdecl.ui > kofxdirectconnectdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kofxdirectconnectdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kofxdirectconnectdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kofxdirectconnectdlgdecl.cpp ;\
@@ -1757,8 +1832,11 @@
rm -f ksplitcorrectiondlg.cpp
echo '#include <kdialog.h>' > ksplitcorrectiondlg.cpp
echo '#include <klocale.h>' >> ksplitcorrectiondlg.cpp
+ echo '#ifndef KMM_I18N' >> ksplitcorrectiondlg.cpp
+ echo '#define KMM_I18N' >> ksplitcorrectiondlg.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> ksplitcorrectiondlg.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> ksplitcorrectiondlg.cpp
+ echo '#endif' >> ksplitcorrectiondlg.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/ksplitcorrectiondlg.ui; \
$(UIC) -tr ${UIC_TR} -i ksplitcorrectiondlg.h $(srcdir)/ksplitcorrectiondlg.ui > ksplitcorrectiondlg.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" ksplitcorrectiondlg.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_ksplitcorrectiondlg,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> ksplitcorrectiondlg.cpp ;\
@@ -1776,8 +1854,11 @@
rm -f kmymoneypricedlgdecl.cpp
echo '#include <kdialog.h>' > kmymoneypricedlgdecl.cpp
echo '#include <klocale.h>' >> kmymoneypricedlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneypricedlgdecl.cpp
+ echo '#define KMM_I18N' >> kmymoneypricedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneypricedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneypricedlgdecl.cpp
+ echo '#endif' >> kmymoneypricedlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneypricedlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneypricedlgdecl.h $(srcdir)/kmymoneypricedlgdecl.ui > kmymoneypricedlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneypricedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneypricedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneypricedlgdecl.cpp ;\
@@ -1795,8 +1876,11 @@
rm -f kadvancedbanksettingsdlgdecl.cpp
echo '#include <kdialog.h>' > kadvancedbanksettingsdlgdecl.cpp
echo '#include <klocale.h>' >> kadvancedbanksettingsdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kadvancedbanksettingsdlgdecl.cpp
+ echo '#define KMM_I18N' >> kadvancedbanksettingsdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kadvancedbanksettingsdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kadvancedbanksettingsdlgdecl.cpp
+ echo '#endif' >> kadvancedbanksettingsdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kadvancedbanksettingsdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kadvancedbanksettingsdlgdecl.h $(srcdir)/kadvancedbanksettingsdlgdecl.ui > kadvancedbanksettingsdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kadvancedbanksettingsdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kadvancedbanksettingsdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kadvancedbanksettingsdlgdecl.cpp ;\
@@ -1814,8 +1898,11 @@
rm -f kcsvprogressdlgdecl.cpp
echo '#include <kdialog.h>' > kcsvprogressdlgdecl.cpp
echo '#include <klocale.h>' >> kcsvprogressdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kcsvprogressdlgdecl.cpp
+ echo '#define KMM_I18N' >> kcsvprogressdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcsvprogressdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcsvprogressdlgdecl.cpp
+ echo '#endif' >> kcsvprogressdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kcsvprogressdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kcsvprogressdlgdecl.h $(srcdir)/kcsvprogressdlgdecl.ui > kcsvprogressdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcsvprogressdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcsvprogressdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcsvprogressdlgdecl.cpp ;\
@@ -1833,8 +1920,11 @@
rm -f knewequityentrydecl.cpp
echo '#include <kdialog.h>' > knewequityentrydecl.cpp
echo '#include <klocale.h>' >> knewequityentrydecl.cpp
+ echo '#ifndef KMM_I18N' >> knewequityentrydecl.cpp
+ echo '#define KMM_I18N' >> knewequityentrydecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewequityentrydecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewequityentrydecl.cpp
+ echo '#endif' >> knewequityentrydecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/knewequityentrydecl.ui; \
$(UIC) -tr ${UIC_TR} -i knewequityentrydecl.h $(srcdir)/knewequityentrydecl.ui > knewequityentrydecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewequityentrydecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewequityentrydecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewequityentrydecl.cpp ;\
@@ -1852,8 +1942,11 @@
rm -f kimportverifydlgdecl.cpp
echo '#include <kdialog.h>' > kimportverifydlgdecl.cpp
echo '#include <klocale.h>' >> kimportverifydlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kimportverifydlgdecl.cpp
+ echo '#define KMM_I18N' >> kimportverifydlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kimportverifydlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kimportverifydlgdecl.cpp
+ echo '#endif' >> kimportverifydlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kimportverifydlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kimportverifydlgdecl.h $(srcdir)/kimportverifydlgdecl.ui > kimportverifydlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kimportverifydlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kimportverifydlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kimportverifydlgdecl.cpp ;\
@@ -1871,8 +1964,11 @@
rm -f kequitypriceupdatedlgdecl.cpp
echo '#include <kdialog.h>' > kequitypriceupdatedlgdecl.cpp
echo '#include <klocale.h>' >> kequitypriceupdatedlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kequitypriceupdatedlgdecl.cpp
+ echo '#define KMM_I18N' >> kequitypriceupdatedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kequitypriceupdatedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kequitypriceupdatedlgdecl.cpp
+ echo '#endif' >> kequitypriceupdatedlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kequitypriceupdatedlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kequitypriceupdatedlgdecl.h $(srcdir)/kequitypriceupdatedlgdecl.ui > kequitypriceupdatedlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kequitypriceupdatedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kequitypriceupdatedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kequitypriceupdatedlgdecl.cpp ;\
@@ -1890,8 +1986,11 @@
rm -f kgncimportoptionsdlgdecl.cpp
echo '#include <kdialog.h>' > kgncimportoptionsdlgdecl.cpp
echo '#include <klocale.h>' >> kgncimportoptionsdlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kgncimportoptionsdlgdecl.cpp
+ echo '#define KMM_I18N' >> kgncimportoptionsdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kgncimportoptionsdlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kgncimportoptionsdlgdecl.cpp
+ echo '#endif' >> kgncimportoptionsdlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kgncimportoptionsdlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kgncimportoptionsdlgdecl.h $(srcdir)/kgncimportoptionsdlgdecl.ui > kgncimportoptionsdlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kgncimportoptionsdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kgncimportoptionsdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kgncimportoptionsdlgdecl.cpp ;\
@@ -1909,8 +2008,11 @@
rm -f kendingbalancedlgdecl.cpp
echo '#include <kdialog.h>' > kendingbalancedlgdecl.cpp
echo '#include <klocale.h>' >> kendingbalancedlgdecl.cpp
+ echo '#ifndef KMM_I18N' >> kendingbalancedlgdecl.cpp
+ echo '#define KMM_I18N' >> kendingbalancedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kendingbalancedlgdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kendingbalancedlgdecl.cpp
+ echo '#endif' >> kendingbalancedlgdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kendingbalancedlgdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kendingbalancedlgdecl.h $(srcdir)/kendingbalancedlgdecl.ui > kendingbalancedlgdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kendingbalancedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kendingbalancedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kendingbalancedlgdecl.cpp ;\
@@ -1928,8 +2030,11 @@
rm -f kcurrencycalculatordecl.cpp
echo '#include <kdialog.h>' > kcurrencycalculatordecl.cpp
echo '#include <klocale.h>' >> kcurrencycalculatordecl.cpp
+ echo '#ifndef KMM_I18N' >> kcurrencycalculatordecl.cpp
+ echo '#define KMM_I18N' >> kcurrencycalculatordecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcurrencycalculatordecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcurrencycalculatordecl.cpp
+ echo '#endif' >> kcurrencycalculatordecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kcurrencycalculatordecl.ui; \
$(UIC) -tr ${UIC_TR} -i kcurrencycalculatordecl.h $(srcdir)/kcurrencycalculatordecl.ui > kcurrencycalculatordecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcurrencycalculatordecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcurrencycalculatordecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcurrencycalculatordecl.cpp ;\
diff -u -r kmymoney2/views/Makefile.in kmymoney2/views/Makefile.in
--- kmymoney2/views/Makefile.in 2006-05-15 16:21:40.000000000 +0200
+++ kmymoney2/views/Makefile.in 2006-05-19 13:52:44.736361504 +0200
@@ -1024,8 +1024,11 @@
rm -f kpayeesviewdecl.cpp
echo '#include <kdialog.h>' > kpayeesviewdecl.cpp
echo '#include <klocale.h>' >> kpayeesviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kpayeesviewdecl.cpp
+ echo '#define KMM_I18N' >> kpayeesviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kpayeesviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kpayeesviewdecl.cpp
+ echo '#endif' >> kpayeesviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kpayeesviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kpayeesviewdecl.h $(srcdir)/kpayeesviewdecl.ui > kpayeesviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kpayeesviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kpayeesviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kpayeesviewdecl.cpp ;\
@@ -1043,8 +1046,11 @@
rm -f kscheduledviewdecl.cpp
echo '#include <kdialog.h>' > kscheduledviewdecl.cpp
echo '#include <klocale.h>' >> kscheduledviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kscheduledviewdecl.cpp
+ echo '#define KMM_I18N' >> kscheduledviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kscheduledviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kscheduledviewdecl.cpp
+ echo '#endif' >> kscheduledviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kscheduledviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kscheduledviewdecl.h $(srcdir)/kscheduledviewdecl.ui > kscheduledviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kscheduledviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kscheduledviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kscheduledviewdecl.cpp ;\
@@ -1062,8 +1068,11 @@
rm -f kbankviewdecl.cpp
echo '#include <kdialog.h>' > kbankviewdecl.cpp
echo '#include <klocale.h>' >> kbankviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kbankviewdecl.cpp
+ echo '#define KMM_I18N' >> kbankviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kbankviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kbankviewdecl.cpp
+ echo '#endif' >> kbankviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kbankviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kbankviewdecl.h $(srcdir)/kbankviewdecl.ui > kbankviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kbankviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kbankviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kbankviewdecl.cpp ;\
@@ -1081,8 +1090,11 @@
rm -f kcategoriesviewdecl.cpp
echo '#include <kdialog.h>' > kcategoriesviewdecl.cpp
echo '#include <klocale.h>' >> kcategoriesviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kcategoriesviewdecl.cpp
+ echo '#define KMM_I18N' >> kcategoriesviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcategoriesviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcategoriesviewdecl.cpp
+ echo '#endif' >> kcategoriesviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kcategoriesviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kcategoriesviewdecl.h $(srcdir)/kcategoriesviewdecl.ui > kcategoriesviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcategoriesviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcategoriesviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcategoriesviewdecl.cpp ;\
@@ -1100,8 +1112,11 @@
rm -f kstocktransactionviewdecl.cpp
echo '#include <kdialog.h>' > kstocktransactionviewdecl.cpp
echo '#include <klocale.h>' >> kstocktransactionviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kstocktransactionviewdecl.cpp
+ echo '#define KMM_I18N' >> kstocktransactionviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kstocktransactionviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kstocktransactionviewdecl.cpp
+ echo '#endif' >> kstocktransactionviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kstocktransactionviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kstocktransactionviewdecl.h $(srcdir)/kstocktransactionviewdecl.ui > kstocktransactionviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kstocktransactionviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kstocktransactionviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kstocktransactionviewdecl.cpp ;\
@@ -1119,8 +1134,11 @@
rm -f kinvestmentviewdecl.cpp
echo '#include <kdialog.h>' > kinvestmentviewdecl.cpp
echo '#include <klocale.h>' >> kinvestmentviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kinvestmentviewdecl.cpp
+ echo '#define KMM_I18N' >> kinvestmentviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kinvestmentviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kinvestmentviewdecl.cpp
+ echo '#endif' >> kinvestmentviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kinvestmentviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kinvestmentviewdecl.h $(srcdir)/kinvestmentviewdecl.ui > kinvestmentviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kinvestmentviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kinvestmentviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kinvestmentviewdecl.cpp ;\
diff -u -r kmymoney2/widgets/Makefile.in kmymoney2/widgets/Makefile.in
--- kmymoney2/widgets/Makefile.in 2006-05-15 16:21:40.000000000 +0200
+++ kmymoney2/widgets/Makefile.in 2006-05-19 13:55:57.907994952 +0200
@@ -1239,8 +1239,11 @@
rm -f kmymoneyonlinequoteconfigdecl.cpp
echo '#include <kdialog.h>' > kmymoneyonlinequoteconfigdecl.cpp
echo '#include <klocale.h>' >> kmymoneyonlinequoteconfigdecl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneyonlinequoteconfigdecl.cpp
+ echo '#define KMM_I18N' >> kmymoneyonlinequoteconfigdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyonlinequoteconfigdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyonlinequoteconfigdecl.cpp
+ echo '#endif' >> kmymoneyonlinequoteconfigdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyonlinequoteconfigdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneyonlinequoteconfigdecl.h $(srcdir)/kmymoneyonlinequoteconfigdecl.ui > kmymoneyonlinequoteconfigdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyonlinequoteconfigdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyonlinequoteconfigdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyonlinequoteconfigdecl.cpp ;\
@@ -1258,8 +1261,11 @@
rm -f kmymoneyreportconfigtab1decl.cpp
echo '#include <kdialog.h>' > kmymoneyreportconfigtab1decl.cpp
echo '#include <klocale.h>' >> kmymoneyreportconfigtab1decl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneyreportconfigtab1decl.cpp
+ echo '#define KMM_I18N' >> kmymoneyreportconfigtab1decl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportconfigtab1decl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportconfigtab1decl.cpp
+ echo '#endif' >> kmymoneyreportconfigtab1decl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportconfigtab1decl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneyreportconfigtab1decl.h $(srcdir)/kmymoneyreportconfigtab1decl.ui > kmymoneyreportconfigtab1decl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportconfigtab1decl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportconfigtab1decl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportconfigtab1decl.cpp ;\
@@ -1277,8 +1283,11 @@
rm -f kschedulebriefwidget.cpp
echo '#include <kdialog.h>' > kschedulebriefwidget.cpp
echo '#include <klocale.h>' >> kschedulebriefwidget.cpp
+ echo '#ifndef KMM_I18N' >> kschedulebriefwidget.cpp
+ echo '#define KMM_I18N' >> kschedulebriefwidget.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kschedulebriefwidget.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kschedulebriefwidget.cpp
+ echo '#endif' >> kschedulebriefwidget.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kschedulebriefwidget.ui; \
$(UIC) -tr ${UIC_TR} -i kschedulebriefwidget.h $(srcdir)/kschedulebriefwidget.ui > kschedulebriefwidget.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kschedulebriefwidget.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kschedulebriefwidget,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kschedulebriefwidget.cpp ;\
@@ -1296,8 +1305,11 @@
rm -f kmymoneyreportcontroldecl.cpp
echo '#include <kdialog.h>' > kmymoneyreportcontroldecl.cpp
echo '#include <klocale.h>' >> kmymoneyreportcontroldecl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneyreportcontroldecl.cpp
+ echo '#define KMM_I18N' >> kmymoneyreportcontroldecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportcontroldecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportcontroldecl.cpp
+ echo '#endif' >> kmymoneyreportcontroldecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportcontroldecl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneyreportcontroldecl.h $(srcdir)/kmymoneyreportcontroldecl.ui > kmymoneyreportcontroldecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportcontroldecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportcontroldecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportcontroldecl.cpp ;\
@@ -1315,8 +1327,11 @@
rm -f kmymoneypriceviewdecl.cpp
echo '#include <kdialog.h>' > kmymoneypriceviewdecl.cpp
echo '#include <klocale.h>' >> kmymoneypriceviewdecl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneypriceviewdecl.cpp
+ echo '#define KMM_I18N' >> kmymoneypriceviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneypriceviewdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneypriceviewdecl.cpp
+ echo '#endif' >> kmymoneypriceviewdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneypriceviewdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneypriceviewdecl.h $(srcdir)/kmymoneypriceviewdecl.ui > kmymoneypriceviewdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneypriceviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneypriceviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneypriceviewdecl.cpp ;\
@@ -1334,8 +1349,11 @@
rm -f kmymoneyreportconfigtab2decl.cpp
echo '#include <kdialog.h>' > kmymoneyreportconfigtab2decl.cpp
echo '#include <klocale.h>' >> kmymoneyreportconfigtab2decl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneyreportconfigtab2decl.cpp
+ echo '#define KMM_I18N' >> kmymoneyreportconfigtab2decl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportconfigtab2decl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportconfigtab2decl.cpp
+ echo '#endif' >> kmymoneyreportconfigtab2decl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportconfigtab2decl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneyreportconfigtab2decl.h $(srcdir)/kmymoneyreportconfigtab2decl.ui > kmymoneyreportconfigtab2decl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportconfigtab2decl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportconfigtab2decl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportconfigtab2decl.cpp ;\
@@ -1353,8 +1371,11 @@
rm -f kmymoneyreportconfigtab3decl.cpp
echo '#include <kdialog.h>' > kmymoneyreportconfigtab3decl.cpp
echo '#include <klocale.h>' >> kmymoneyreportconfigtab3decl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneyreportconfigtab3decl.cpp
+ echo '#define KMM_I18N' >> kmymoneyreportconfigtab3decl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportconfigtab3decl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportconfigtab3decl.cpp
+ echo '#endif' >> kmymoneyreportconfigtab3decl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportconfigtab3decl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneyreportconfigtab3decl.h $(srcdir)/kmymoneyreportconfigtab3decl.ui > kmymoneyreportconfigtab3decl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportconfigtab3decl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportconfigtab3decl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportconfigtab3decl.cpp ;\
@@ -1372,8 +1393,11 @@
rm -f kmymoneygpgconfigdecl.cpp
echo '#include <kdialog.h>' > kmymoneygpgconfigdecl.cpp
echo '#include <klocale.h>' >> kmymoneygpgconfigdecl.cpp
+ echo '#ifndef KMM_I18N' >> kmymoneygpgconfigdecl.cpp
+ echo '#define KMM_I18N' >> kmymoneygpgconfigdecl.cpp
echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneygpgconfigdecl.cpp
echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneygpgconfigdecl.cpp
+ echo '#endif' >> kmymoneygpgconfigdecl.cpp
$(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneygpgconfigdecl.ui; \
$(UIC) -tr ${UIC_TR} -i kmymoneygpgconfigdecl.h $(srcdir)/kmymoneygpgconfigdecl.ui > kmymoneygpgconfigdecl.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneygpgconfigdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneygpgconfigdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneygpgconfigdecl.cpp ;\
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 22 Feb 2006 15:00:30 -0000 1.4
+++ .cvsignore 22 May 2006 01:36:07 -0000 1.5
@@ -1 +1 @@
-kmymoney2-0.8.3.tar.bz2
+kmymoney2-0.8.4.tar.bz2
Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kmymoney2.spec 13 Apr 2006 19:47:36 -0000 1.13
+++ kmymoney2.spec 22 May 2006 01:36:07 -0000 1.14
@@ -16,8 +16,8 @@
Summary: Personal finance
Name: kmymoney2
-Version: 0.8.3
-Release: 3%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
License: GPL
Url: http://kmymoney2.sourceforge.net/
@@ -25,6 +25,8 @@
Source: http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: kmymoney2-0.8.4-enable_final.patch
+
BuildRequires: desktop-file-utils
BuildRequires: automake
BuildRequires: libxml2-devel
@@ -52,6 +54,8 @@
%prep
%setup -q
+%patch1 -p0 -b .enable_final
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -59,8 +63,10 @@
%configure \
--disable-rpath \
+ --disable-gcc-hidden-visibility \
+ --enable-new-ldflags \
--disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --disable-dependancy-tracking --enable-final \
%{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
%{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
%{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -153,6 +159,9 @@
%changelog
+* Sun May 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.4-1
+- 0.8.4
+
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Feb 2006 15:00:30 -0000 1.4
+++ sources 22 May 2006 01:36:07 -0000 1.5
@@ -1 +1 @@
-eae0b003b4e9455c8a18943d86f27759 kmymoney2-0.8.3.tar.bz2
+edac4fad63c3a9f90c054e105e48aa7a kmymoney2-0.8.4.tar.bz2
More information about the fedora-extras-commits
mailing list