Clean up common_gui.{cpp,h}.

Signed-off-by: Mark Watkins <jedimark@users.sourceforge.net>

sleepyhead/common_gui.cpp

@@ -10,59 +10,36 @@
  * distribution for more details. */
 
 #include "common_gui.h"
-#include "qglobal.h"
 
 #ifndef BUILD_WITH_MSVC
 # include <unistd.h>
 #endif
 
-#ifdef Q_OS_WIN32
-#include "windows.h"
-void sh_delay(int ms)
-{
-    Sleep(ms);
-}
-#else
-void sh_delay(int ms)
-{
-    sleep(ms/1000);
-}
-#endif
-
-
-
 #if (QT_VERSION >= QT_VERSION_CHECK(4,8,0))
 // Qt 4.8 makes this a whole lot easier
 Qt::DayOfWeek firstDayOfWeekFromLocale()
 {
     return QLocale::system().firstDayOfWeek();
 }
-
+#elif defined(__GLIBC__)
-#else
-/*#if defined(Q_OS_MAC)
-#include <Cocoa/Cocoa.h>
-#endif */
-
-#ifdef Q_OS_WIN
-#include "windows.h"
-#endif
-
-#ifdef __GLIBC__
 # include <langinfo.h>
-#endif
-
-
-#ifdef Q_OS_WIN32
-#include <dos.h>
-#endif
-
-
-// This function has been "borrowed".. Ahem..
 Qt::DayOfWeek firstDayOfWeekFromLocale()
 {
-    Qt::DayOfWeek firstDay = Qt::Monday; // Fallback, acknowledging the awesome concept of Week End.
+    const unsigned char *const s = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
-
+    if (s && *s >= 1 && *s <= 7) {
-#ifdef Q_OS_WIN
+        // Map between nl_langinfo and Qt:
+        //              Sun Mon Tue Wed Thu Fri Sat
+        // nl_langinfo:  1   2   3   4   5   6   7
+        //   DayOfWeek:  7   1   2   3   4   5   6
+        return (Qt::DayOfWeek)((*s + 5) % 7 + 1);
+    }
+    return Qt::Monday;
+}
+#elif defined(Q_OS_WIN)
+# include "windows.h"
+Qt::DayOfWeek firstDayOfWeekFromLocale()
+{
+    Qt::DayOfWeek firstDay = Qt::Monday; // Fallback, acknowledging the awesome concept of weekends.
     WCHAR wsDay[4];
 # if defined(_WIN32_WINNT_VISTA) && WINVER >= _WIN32_WINNT_VISTA && defined(LOCALE_NAME_USER_DEFAULT)
     if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, wsDay, 4)) {
@@ -71,23 +48,12 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
 # endif
         bool ok;
         int wfd = QString::fromWCharArray(wsDay).toInt(&ok) + 1;
-        if (ok) {
+        if (ok)
-            firstDay = (Qt::DayOfWeek)(unsigned char)wfd;
+            return (Qt::DayOfWeek)(unsigned char)wfd;
     }
-    }
-#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;
-
-    firstDay = (Qt::DayOfWeek)(unsigned char)day; */
-#endif
     return firstDay;
 }
-#endif
+#endif // QT_VERSION
-
 
 // Flag Colors
 QColor COLOR_Hypopnea       = Qt::blue;
@@ -124,7 +90,7 @@ QColor COLOR_MaxLeak=COLOR_DarkRed;
 QColor COLOR_Snore        = COLOR_DarkGray;
 QColor COLOR_RespRate     = COLOR_DarkBlue;
 QColor COLOR_MaskPressure = COLOR_Blue;
-QColor COLOR_PTB=COLOR_Gray;              //Patient Triggered Breathing
+QColor COLOR_PTB          = COLOR_Gray;       // Patient-Triggered Breathing
 QColor COLOR_MinuteVent   = COLOR_Cyan;
 QColor COLOR_TgMV         = COLOR_DarkCyan;
 QColor COLOR_TidalVolume  = COLOR_Magenta;
@@ -133,7 +99,3 @@ QColor COLOR_IE=COLOR_DarkRed;            // Inspiratory Expiratory Ratio
 QColor COLOR_Te           = COLOR_DarkGreen;
 QColor COLOR_Ti           = COLOR_DarkBlue;
 QColor COLOR_SleepStage   = COLOR_Gray;
-
-
-
-

sleepyhead/common_gui.h

@@ -18,10 +18,6 @@
 //! \brief Gets the first day of week from the system locale, to show in the calendars.
 Qt::DayOfWeek firstDayOfWeekFromLocale();
 
-//! \brief Delay of ms milliseconds
-void sh_delay(int ms);
-
-
 // Flag Colors
 extern QColor COLOR_Hypopnea;
 extern QColor COLOR_Obstructive;
@@ -67,5 +63,4 @@ extern QColor COLOR_Te;
 extern QColor COLOR_Ti;
 extern QColor COLOR_SleepStage;
 
-
+#endif // COMMON_GUI_H
-#endif