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

Mac build fix take #1

Browse Source
This commit is contained in:
Mark Watkins 2011-11-16 08:02:10 +10:00
parent 3ffbc14138
commit 231e8749c6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common_gui.cpp
View File

@ -3,7 +3,6 @@
#if QT_VERSION<0x400800
#if defined(Q_OS_MAC)
#include "cocoacommon.h"
#include <Cocoa/Cocoa.h>
#endif
@ -15,9 +14,12 @@
#include <langinfo.h>
#endif
// This function has been "borrowed".. Ahem..
Qt::DayOfWeek firstDayOfWeekFromLocale()
{
Qt::DayOfWeek firstDay = Qt::Monday;
Qt::DayOfWeek firstDay = Qt::Monday; // Fallback, acknowledging the awesome concept of Week End.
#ifdef Q_OS_WIN
WCHAR wsDay[4];
# if defined(_WIN32_WINNT_VISTA) && WINVER >= _WIN32_WINNT_VISTA && defined(LOCALE_NAME_USER_DEFAULT)
@ -34,6 +36,7 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
#elif defined(__GLIBC__)
firstDay = (Qt::DayOfWeek)(unsigned char)((*nl_langinfo(_NL_TIME_FIRST_WEEKDAY) + 5) % 7 + 1);
#elif defined(Q_OS_MAC)
// Unsure if this will work.. Most Mac users use 4.8 anyway, so won't see this code..
NSCalendar *cal = [NSCalendar currentCalendar];
int day = ([cal firstWeekday] + 5) % 7 + 1;
@ -44,6 +47,7 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
#else
// Qt 4.8 makes this a whole lot easier
Qt::DayOfWeek firstDayOfWeekFromLocale()
{
return QLocale::system().firstDayOfWeek();

2
common_gui.h
View File

@ -1,10 +1,8 @@
#ifndef COMMON_GUI_H
#define COMMON_GUI_H
//#if QT_VERSION
#include <QLocale>
Qt::DayOfWeek firstDayOfWeekFromLocale();
//#endif
#endif