[patch] kmymoney-test.patch for files/

kmymoney-test.patch (text/plain), 5.52 KB, created by Ian Delaney (RETIRED) on 2012-01-28 15:43:57 UTC

diff -ur kmymoney-4.5.3.orig/kmymoney/reports/CMakeLists.txt kmymoney-4.5.3/kmymoney/reports/CMakeLists.txt
--- kmymoney/reports/CMakeLists.txt	2011-02-12 17:05:39.000000000 +0800
+++ kmymoney/reports/CMakeLists.txt	2012-01-27 22:50:48.976003621 +0800
@@ -6,8 +6,6 @@
   listtable.cpp
   objectinfotable.cpp
   pivotgrid.cpp
-  pivottable.cpp
-  querytable.cpp
   reporttable.cpp
   kbalanceaxis.cpp
 )
@@ -27,23 +25,4 @@
 
   target_link_libraries( pivotgridtest reports kmymoney_base kmymoney_common kmm_storage ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
 
-IF(NOT WIN32)
-  # Pivot Table
-  set( pivottabletest_SRCS pivottabletest.cpp reportstestcommon.cpp ../mymoney/mymoneytestutils.cpp )
-
-  kde4_add_unit_test( pivottabletest TESTNAME kmymoney-pivottabletest ${pivottabletest_SRCS} )
-
-  ADD_DEPENDENCIES( pivottabletest dialogs widgets reports settings kmymoney_base kmymoney_common kmm_kdchart kmm_storage kmm_config )
-
-  target_link_libraries( pivottabletest reports settings kmymoney_base kmymoney_common dialogs widgets kmm_kdchart kmm_storage kmm_config ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS}  ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
-
-  # Query Table
-  set( querytabletest_SRCS querytabletest.cpp reportstestcommon.cpp ../mymoney/mymoneytestutils.cpp )
-
-  kde4_add_unit_test( querytabletest TESTNAME kmymoney-querytabletest ${querytabletest_SRCS} )
-  ADD_DEPENDENCIES( querytabletest dialogs widgets reports settings kmymoney_base kmymoney_common kmm_storage kmm_config )
-
-  target_link_libraries( querytabletest reports kmymoney_base kmymoney_common dialogs widgets kmm_storage kmm_config ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
-ENDIF(NOT WIN32)
-
 ENDIF( KDE4_BUILD_TESTS )
diff -ur kmymoney-4.5.3.orig/kmymoney/dialogs/kbalancechartdlg.cpp kmymoney-4.5.3/kmymoney/dialogs/kbalancechartdlg.cpp
--- kmymoney/dialogs/kbalancechartdlg.cpp	2011-02-12 17:05:47.000000000 +0800
+++ kmymoney/dialogs/kbalancechartdlg.cpp	2012-01-27 23:54:06.720004964 +0800
@@ -83,12 +83,9 @@
   reportCfg.setColumnsAreDays(true);
   reportCfg.setConvertCurrency(false);
   reportCfg.setMixedTime(true);
-  reports::PivotTable table(reportCfg);
-
+  
   reports::KReportChartView* chartWidget = new reports::KReportChartView(this);
 
-  table.drawChart(*chartWidget);
-
   // add another row for limit
   bool needRow = false;
   bool haveMinBalance = false

diff -ur kmymoney-4.5.3.orig/kmymoney/views/CMakeLists.txt kmmoney-4.5.3/kmymoney/views/CMakeLists.txt
--- kmymoney/views/CMakeLists.txt	2011-02-12 17:05:48.000000000 +0800
+++ kmymoney/views/CMakeLists.txt	2012-01-28 04:15:42.461010514 +0800
@@ -8,7 +8,6 @@
   kforecastview.cpp
   kgloballedgerview.cpp
   kwelcomepage.cpp
-  khomeview.cpp
   kinstitutionsview.cpp
   kinvestmentview.cpp
   kmymoneyfile.cpp
diff -ur kmymoney-4.5.3.orig/kmymoney/views/kforecastview.cpp kmymoney-4.5.3/kmymoney/views/kforecastview.cpp
--- kmymoney/views/kforecastview.cpp	2011-02-12 17:05:47.000000000 +0800
+++ kmymoney/views/kforecastview.cpp	2012-01-28 04:33:14.441010885 +0800
@@ -1001,10 +1001,6 @@
   reportCfg.setConvertCurrency(true);
   reportCfg.setIncludingForecast(true);
   reportCfg.setDateFilter(QDate::currentDate(), QDate::currentDate().addDays(m_forecastDays->value()));
-  reports::PivotTable table(reportCfg);
-
-  table.drawChart(*m_forecastChart);
-
   // Adjust the size
   m_forecastChart->resize(m_tab->width() - 10, m_tab->height());
   //m_forecastChart->show();
diff -ur kmymoney-4.5.3.orig/kmymoney/views/kreportsview.cpp kmymoney-4.5.3/kmymoney/views/kreportsview.cpp
--- kmymoney/views/kreportsview.cpp	2011-02-12 17:05:48.000000000 +0800
+++ kmymoney-4.5.3/kmymoney/views/kreportsview.cpp	2012-01-28 04:56:37.200011382 +0800
@@ -176,11 +176,7 @@
   delete m_table;
   m_table = 0;
 
-  if (m_report.reportType() == MyMoneyReport::ePivotTable) {
-    m_table = new PivotTable(m_report);
-  } else if (m_report.reportType() == MyMoneyReport::eQueryTable) {
-    m_table = new QueryTable(m_report);
-  } else if (m_report.reportType() == MyMoneyReport::eInfoTable) {
+  if (m_report.reportType() == MyMoneyReport::eInfoTable) {
     m_table = new ObjectInfoTable(m_report);
   }

diff -ur kmymoney-4.5.3.orig/kmymoney/views/kmymoneyview.cpp kmymoney-4.5.3/kmymoney/views/kmymoneyview.cpp
--- kmymoney/views/kmymoneyview.cpp	2011-02-12 17:05:47.000000000 +0800
+++ kmymoney/views/kmymoneyview.cpp	2012-01-28 21:34:52.495999124 +0800
@@ -143,7 +143,6 @@
   connect(this, SIGNAL(reconciliationStarts(const MyMoneyAccount&, const QDate&, const MyMoneyMoney&)), Models::instance()->accountsModel(), SLOT(slotReconcileAccount(const MyMoneyAccount&, const QDate&, const MyMoneyMoney&)));
 
   // Page 0
-  m_homeView = new KHomeView();
   m_homeViewFrame = m_model->addPage(m_homeView, i18n("Home"));
   m_homeViewFrame->setIcon(KIcon("go-home"));
   connect(m_homeView, SIGNAL(ledgerSelected(const QString&, const QString&)),
@@ -1631,7 +1630,6 @@
   m_payeesView->slotLoadPayees();
   m_ledgerView->slotLoadView();
   m_budgetView->slotRefreshView();
-  m_homeView->slotLoadView();
   m_investmentView->slotLoadView();
   m_reportsView->slotLoadView();
   m_forecastView->slotLoadForecast();
@@ -2179,8 +2177,6 @@
 {
   if (m_reportsViewFrame == currentPage())
     m_reportsView->slotPrintView();
-  else if (m_homeViewFrame == currentPage())
-    m_homeView->slotPrintView();
 }
 
 KMyMoneyViewBase* KMyMoneyView::addBasePage(const QString& title, const QString& icon)