[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] kmymoney: Port some TODOs involving the first day of the week.
From:       Cristian_Oneț <onet.cristian () gmail ! com>
Date:       2016-06-22 16:24:20
Message-ID: E1bFkwu-0001he-CM () code ! kde ! org
[Download RAW message or body]

Git commit 324a995d48681aad382fc1fd6abab5b13b633904 by Cristian Oneț.
Committed on 22/06/2016 at 16:23.
Pushed by conet into branch 'master'.

Port some TODOs involving the first day of the week.

M  +2    -4    kmymoney/reports/pivottable.cpp
M  +3    -4    kmymoney/widgets/register.cpp

http://commits.kde.org/kmymoney/324a995d48681aad382fc1fd6abab5b13b633904

diff --git a/kmymoney/reports/pivottable.cpp b/kmymoney/reports/pivottable.cpp
index e1ac131..86a166e 100644
--- a/kmymoney/reports/pivottable.cpp
+++ b/kmymoney/reports/pivottable.cpp
@@ -418,10 +418,9 @@ void PivotTable::collapseColumns()
 
   int columnpitch = m_config_f.columnPitch();
   if (columnpitch != 1) {
-    // TODO: port to kf5
     int sourcemonth = (m_config_f.isColumnsAreDays())
                       // use the user's locale to determine the week's start
-                      ? (m_beginDate.dayOfWeek() + 8 - 1/*KLocale::global()->weekStartDay()*/) % 7
+                      ? (m_beginDate.dayOfWeek() + 8 - QLocale().firstDayOfWeek()) % 7
                       : m_beginDate.month();
     int sourcecolumn = 1;
     int destcolumn = 1;
@@ -533,8 +532,7 @@ void PivotTable::calculateColumnHeadings()
       QDate prv = m_beginDate;
 
       // use the user's locale to determine the week's start
-      // TODO: port to kf5
-      int dow = (day.dayOfWeek() + 8 - 1/*KLocale::global()->weekStartDay()*/) % 7;
+      int dow = (day.dayOfWeek() + 8 - QLocale().firstDayOfWeek()) % 7;
 
       while (day <= m_endDate) {
         if (((dow % columnpitch) == 0) || (day == m_endDate)) {
diff --git a/kmymoney/widgets/register.cpp b/kmymoney/widgets/register.cpp
index 2e982d7..b2751c4 100644
--- a/kmymoney/widgets/register.cpp
+++ b/kmymoney/widgets/register.cpp
@@ -1954,10 +1954,9 @@ void Register::addGroupMarkers()
       thisMonth.setDate(today.year(), today.month(), 1);
       lastMonth = thisMonth.addMonths(-1);
       yesterday = today.addDays(-1);
-      // a = QDate::dayOfWeek()      todays weekday (1 = Monday, 7 = Sunday)
-      // b = KLocale::weekStartDay() first day of week (1 = Monday, 7 = Sunday)
-      // TODO: prt this to kf5
-      weekStartOfs = today.dayOfWeek() - 1;//KLocale::global()->weekStartDay();
+      // a = QDate::dayOfWeek()         todays weekday (1 = Monday, 7 = Sunday)
+      // b = QLocale().firstDayOfWeek() first day of week (1 = Monday, 7 = Sunday)
+      weekStartOfs = today.dayOfWeek() - QLocale().firstDayOfWeek();
       if (weekStartOfs < 0) {
         weekStartOfs = 7 + weekStartOfs;
       }
[prev in list] [next in list] [prev in thread] [next in thread]