chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dropped faulty firstdayofweek detection for Qt 4.7.x MacOSX builds

Browse Source
This commit is contained in:
Mark Watkins 2011-11-17 12:56:44 +10:00
parent 3ce2e4b8ff
commit 89b6d09678
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common_gui.cpp
View File

@ -9,9 +9,9 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
} }
#else #else
#if defined(Q_OS_MAC) /*#if defined(Q_OS_MAC)
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#endif #endif */
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "windows.h" #include "windows.h"
@ -42,12 +42,12 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
} }
#elif defined(__GLIBC__) #elif defined(__GLIBC__)
firstDay = (Qt::DayOfWeek)(unsigned char)((*nl_langinfo(_NL_TIME_FIRST_WEEKDAY) + 5) % 7 + 1); firstDay = (Qt::DayOfWeek)(unsigned char)((*nl_langinfo(_NL_TIME_FIRST_WEEKDAY) + 5) % 7 + 1);
#elif defined(Q_OS_MAC) /*#elif defined(Q_OS_MAC)
// Unsure if this will work.. Most Mac users use 4.8 anyway, so won't see this code.. // Unsure if this will work.. Most Mac users use 4.8 anyway, so won't see this code..
NSCalendar *cal = [NSCalendar currentCalendar]; NSCalendar *cal = [NSCalendar currentCalendar];
int day = ([cal firstWeekday] + 5) % 7 + 1; int day = ([cal firstWeekday] + 5) % 7 + 1;
firstDay = (Qt::DayOfWeek)(unsigned char)day; firstDay = (Qt::DayOfWeek)(unsigned char)day; */
#endif #endif
return firstDay; return firstDay;
} }