SVN commit 969049 by mlaurent: Port++ M +4 -4 CMakeLists.txt M +3 -3 kbudgetvalues.cpp M +10 -1 kbudgetvalues.h M +1 -1 kmymoneyaccounttreebudget.h --- trunk/playground/office/kmymoney/kmymoney2/widgets/CMakeLists.txt #969048:969049 @@ -47,11 +47,11 @@ kmymoneyaccounttreeforecast.cpp kmymoneycalculator.cpp kmymoneychecklistitem.cpp - #kmymoneycombo.cpp + kmymoneycombo.cpp kmymoneycompletion.cpp - #kmymoneycurrencyselector.cpp - #kmymoneydateinput.cpp - #kmymoneydatetbl.cpp + #kmymoneycurrencyselector.cpp + #kmymoneydateinput.cpp + #kmymoneydatetbl.cpp kmymoneyedit.cpp #kmymoneylineedit.cpp kmymoneylistviewitem.cpp --- trunk/playground/office/kmymoney/kmymoney2/widgets/kbudgetvalues.cpp #969048:969049 @@ -46,8 +46,8 @@ #include "kbudgetvalues.h" #include -KBudgetValues::KBudgetValues(QWidget* parent, const char* name) : - KBudgetValuesDecl(parent, name), +KBudgetValues::KBudgetValues(QWidget* parent) : + KBudgetValuesDecl(parent), m_currentTab(m_monthlyButton) { m_budgetDate = QDate(2007,1,1); @@ -256,7 +256,7 @@ { QDate date(m_budgetDate); for(int i = 0; i < 12; ++i) { - m_label[i]->setText(KGlobal::locale()->calendar()->monthName(date, true)); + m_label[i]->setText(KGlobal::locale()->calendar()->monthName(date)); date = date.addMonths(1); } } --- trunk/playground/office/kmymoney/kmymoney2/widgets/kbudgetvalues.h #969048:969049 @@ -40,11 +40,20 @@ /** * @author Thomas Baumgart */ + +class KBudgetValuesDecl : public QWidget, public Ui::KBudgetValuesDecl +{ +public: + KBudgetValuesDecl( QWidget *parent ) : QWidget( parent ) { + setupUi( this ); + } +}; + class KBudgetValues : public KBudgetValuesDecl { Q_OBJECT public: - KBudgetValues(QWidget* parent = 0, const char* name = 0); + KBudgetValues(QWidget* parent = 0); ~KBudgetValues(); void setBudgetValues(const MyMoneyBudget& budget, const MyMoneyBudget::AccountGroup& budgetAccount); --- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneyaccounttreebudget.h #969048:969049 @@ -34,7 +34,7 @@ // ---------------------------------------------------------------------------- // Project Includes #include "kmymoneyaccounttree.h" -#include "../../kmymoney/mymoneybudget.h" +#include "mymoneybudget.h" class KMyMoneyAccountTreeBudgetItem;