From 6c1d52c8248adb9189c944a28efde52330e99b66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:21:28 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kmymoney2/reports/listtable.cpp | 8 ++++---- kmymoney2/reports/pivottable.cpp | 16 ++++++++-------- kmymoney2/reports/pivottabletest.cpp | 6 +++--- kmymoney2/reports/querytabletest.cpp | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kmymoney2/reports') diff --git a/kmymoney2/reports/listtable.cpp b/kmymoney2/reports/listtable.cpp index 1f2e400..504c865 100644 --- a/kmymoney2/reports/listtable.cpp +++ b/kmymoney2/reports/listtable.cpp @@ -157,11 +157,11 @@ namespace reports { //actual dates of the report result += TQString("
"); if(!m_config.fromDate().isNull()) { - result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true)); + result += i18n("Report date range", "%1 through %2").arg(TDEGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(TDEGlobal::locale()->formatDate(m_config.toDate(), true)); result += TQString("
\n"); result += TQString("
 
\n"); - csv += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true)); + csv += i18n("Report date range", "%1 through %2").arg(TDEGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(TDEGlobal::locale()->formatDate(m_config.toDate(), true)); csv += TQString("\n"); } @@ -514,9 +514,9 @@ namespace reports { csv += "\"" + data + "\","; // if we have a locale() then use its date formatter - if ( KGlobal::locale() && ! data.isEmpty() ) { + if ( TDEGlobal::locale() && ! data.isEmpty() ) { TQDate qd = TQDate::fromString ( data, Qt::ISODate ); - data = KGlobal::locale()->formatDate ( qd, true ); + data = TDEGlobal::locale()->formatDate ( qd, true ); } result += TQString ( "%1" ).arg ( data ); } diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp index 7846d93..e41215b 100644 --- a/kmymoney2/reports/pivottable.cpp +++ b/kmymoney2/reports/pivottable.cpp @@ -436,7 +436,7 @@ void PivotTable::collapseColumns(void) { unsigned sourcemonth = (m_config_f.isColumnsAreDays()) // use the user's locale to determine the week's start - ? (m_beginDate.dayOfWeek() + 8 - KGlobal::locale()->weekStartDay()) % 7 + ? (m_beginDate.dayOfWeek() + 8 - TDEGlobal::locale()->weekStartDay()) % 7 : m_beginDate.month(); unsigned sourcecolumn = 1; unsigned destcolumn = 1; @@ -544,7 +544,7 @@ void PivotTable::calculateColumnHeadings(void) unsigned column = 1; while ( column++ < m_numColumns ) { - TQString heading = KGlobal::locale()->calendar()->monthName(columnDate.month(), columnDate.year(), true) + " " + TQString::number(columnDate.day()); + TQString heading = TDEGlobal::locale()->calendar()->monthName(columnDate.month(), columnDate.year(), true) + " " + TQString::number(columnDate.day()); columnDate = columnDate.addDays(1); m_columnHeadings.append( heading); } @@ -555,16 +555,16 @@ void PivotTable::calculateColumnHeadings(void) TQDate prv = m_beginDate; // use the user's locale to determine the week's start - unsigned dow = (day.dayOfWeek() +8 -KGlobal::locale()->weekStartDay())%7; + unsigned dow = (day.dayOfWeek() +8 -TDEGlobal::locale()->weekStartDay())%7; while (day <= m_endDate) { if (((dow % columnpitch) == 0) || (day == m_endDate)) { m_columnHeadings.append(TQString("%1 %2 - %3 %4") - .arg(KGlobal::locale()->calendar()->monthName(prv.month(), prv.year(), true)) + .arg(TDEGlobal::locale()->calendar()->monthName(prv.month(), prv.year(), true)) .arg(prv.day()) - .arg(KGlobal::locale()->calendar()->monthName(day.month(), day.year(), true)) + .arg(TDEGlobal::locale()->calendar()->monthName(day.month(), day.year(), true)) .arg(day.day())); prv = day.addDays(1); } @@ -592,9 +592,9 @@ void PivotTable::calculateColumnHeadings(void) unsigned column = 1; while ( column++ < m_numColumns ) { - TQString heading = KGlobal::locale()->calendar()->monthName(1+segment*columnpitch, 2000, true); + TQString heading = TDEGlobal::locale()->calendar()->monthName(1+segment*columnpitch, 2000, true); if ( columnpitch != 1 ) - heading += "-" + KGlobal::locale()->calendar()->monthName((1+segment)*columnpitch, 2000, true); + heading += "-" + TDEGlobal::locale()->calendar()->monthName((1+segment)*columnpitch, 2000, true); if ( includeyear ) heading += " " + TQString::number(year); m_columnHeadings.append( heading); @@ -1578,7 +1578,7 @@ TQString PivotTable::renderHTML( void ) const //actual dates of the report result += TQString("
"); - result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config_f.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config_f.toDate(), true)); + result += i18n("Report date range", "%1 through %2").arg(TDEGlobal::locale()->formatDate(m_config_f.fromDate(), true)).arg(TDEGlobal::locale()->formatDate(m_config_f.toDate(), true)); result += TQString("
\n"); result += TQString("
 
\n"); diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp index e9fb8b2..b2962e1 100644 --- a/kmymoney2/reports/pivottabletest.cpp +++ b/kmymoney2/reports/pivottabletest.cpp @@ -834,8 +834,8 @@ void PivotTableTest::testColumnType() CPPUNIT_ASSERT(spending_days.m_grid.m_total[eActual][13] == -moSolo); CPPUNIT_ASSERT(spending_days.m_grid.m_total[eActual].m_total == -moSolo-moParent2); - unsigned save_dayweekstart = KGlobal::locale()->weekStartDay(); - KGlobal::locale()->setWeekStartDay(2); + unsigned save_dayweekstart = TDEGlobal::locale()->weekStartDay(); + TDEGlobal::locale()->setWeekStartDay(2); filter.setDateFilter(TQDate(2004,7,2),TQDate(2004,8,1)); filter.setRowType( MyMoneyReport::eExpenseIncome ); @@ -846,7 +846,7 @@ void PivotTableTest::testColumnType() PivotTable spending_weeks( filter ); writeTabletoHTML(spending_weeks,"Spending by Weeks.html"); - KGlobal::locale()->setWeekStartDay(save_dayweekstart); + TDEGlobal::locale()->setWeekStartDay(save_dayweekstart); CPPUNIT_ASSERT(spending_weeks.m_grid.m_total[eActual][0] == moZero); CPPUNIT_ASSERT(spending_weeks.m_grid.m_total[eActual][1] == -moParent2); diff --git a/kmymoney2/reports/querytabletest.cpp b/kmymoney2/reports/querytabletest.cpp index b763276..f19832e 100644 --- a/kmymoney2/reports/querytabletest.cpp +++ b/kmymoney2/reports/querytabletest.cpp @@ -646,8 +646,8 @@ void QueryTableTest::testInvestment(void) CPPUNIT_ASSERT(rows.count() == 16); //this is to make sure that the dates of closing and opening balances and the balance numbers are ok - TQString openingDate = KGlobal::locale()->formatDate(TQDate(2004,1,1), true); - TQString closingDate = KGlobal::locale()->formatDate(TQDate(2005,9,1), true); + TQString openingDate = TDEGlobal::locale()->formatDate(TQDate(2004,1,1), true); + TQString closingDate = TDEGlobal::locale()->formatDate(TQDate(2005,9,1), true); CPPUNIT_ASSERT( html.find(openingDate + ""+i18n("Opening Balance")) > 0); CPPUNIT_ASSERT( html.find(closingDate + ""+i18n("Closing Balance")+" -702.36") > 0); CPPUNIT_ASSERT( html.find(closingDate + ""+i18n("Closing Balance")+" -705.69") > 0); -- cgit v1.2.1