Move git_info.h related stuff out of common_gui.h

sleepyhead/Graphs/glcommon.cpp

@@ -1,4 +1,4 @@
-/* glcommon GL code & font stuff
+/* glcommon GL code & font stuff
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *

sleepyhead/SleepLib/common.cpp

@@ -9,6 +9,17 @@
 #include <QDateTime>
 #include <QDir>
 #include <QThread>
+#include <QGLWidget>
+#include <QOpenGLFunctions>
+#include <QDebug>
+#include <QDir>
+#include <QCoreApplication>
+
+#include "SleepLib/common.h"
+
+#ifndef BUILD_WITH_MSVC
+# include <unistd.h>
+#endif
 
 #ifdef _MSC_VER
 #include <QtZlib/zlib.h>
@@ -22,6 +33,16 @@
 
 // Used by internal settings
 
+
+const QString & gitRevision()
+{
+    return GIT_REVISION;
+}
+const QString & gitBranch()
+{
+    return GIT_BRANCH;
+}
+
 const QString getDeveloperName()
 {
     return STR_DeveloperName;
@@ -42,6 +63,89 @@ const QString getDefaultAppRoot()
     return approot;
 }
 
+QString getOpenGLVersionString()
+{
+    static QString glversion;
+
+    if (glversion.isEmpty()) {
+        QGLWidget w;
+        w.makeCurrent();
+
+#if QT_VERSION < QT_VERSION_CHECK(5,4,0)
+        glversion = QString(QLatin1String(reinterpret_cast<const char*>(glGetString(GL_VERSION))));
+#else
+        QOpenGLFunctions f;
+        f.initializeOpenGLFunctions();
+        glversion = QString(QLatin1String(reinterpret_cast<const char*>(f.glGetString(GL_VERSION))));
+#endif
+        qDebug() << "OpenGL Version:" << glversion;
+    }
+    return glversion;
+}
+
+float getOpenGLVersion()
+{
+    QString glversion = getOpenGLVersionString();
+    glversion = glversion.section(" ",0,0);
+    bool ok;
+    float v = glversion.toFloat(&ok);
+
+    if (!ok) {
+        QString tmp = glversion.section(".",0,1);
+        v = tmp.toFloat(&ok);
+        if (!ok) {
+            // just look at major, we are only interested in whether we have OpenGL 2.0 anyway
+            tmp = glversion.section(".",0,0);
+            v = tmp.toFloat(&ok);
+        }
+    }
+    return v;
+}
+
+QString getGraphicsEngine()
+{
+    QString gfxEngine = QString();
+#ifdef BROKEN_OPENGL_BUILD
+    gfxEngine = CSTR_GFX_BrokenGL;
+#else
+    QString glversion = getOpenGLVersionString();
+    if (glversion.contains(CSTR_GFX_ANGLE)) {
+        gfxEngine = CSTR_GFX_ANGLE;
+    } else {
+        gfxEngine = CSTR_GFX_OpenGL;
+    }
+#endif
+    return gfxEngine;
+}
+QString getBranchVersion()
+{
+    QString version = STR_TR_AppVersion;
+    version += " [";
+    if (GIT_BRANCH != "master") {
+        version += GIT_BRANCH+"-";
+    }
+    version += GIT_REVISION +" ";
+    version += getGraphicsEngine()+"]";
+
+    return version;
+}
+
+QString appResourcePath()
+{
+#ifdef Q_OS_MAC
+    QString path = QDir::cleanPath(QCoreApplication::applicationDirPath() + "/../Resources");
+#else
+    // not sure where it goes on Linux yet
+    QString path = QCoreApplication::applicationDirPath();
+#endif
+    return path;
+}
+
+Qt::DayOfWeek firstDayOfWeekFromLocale()
+{
+    return QLocale::system().firstDayOfWeek();
+}
+
 int idealThreads() { return QThread::idealThreadCount(); }
 
 qint64 timezoneOffset()

sleepyhead/SleepLib/common.h

@@ -16,6 +16,26 @@
 
 #define DEBUG_EFFICIENCY 1
 
+#include <QLocale>
+#include "Graphs/glcommon.h"
+
+const QString CSTR_GFX_ANGLE = "ANGLE";
+const QString CSTR_GFX_OpenGL = "OpenGL";
+const QString CSTR_GFX_BrokenGL = "QWidget";
+
+//! \brief Gets the first day of week from the system locale, to show in the calendars.
+Qt::DayOfWeek firstDayOfWeekFromLocale();
+
+QString getBranchVersion();
+
+QString appResourcePath();
+QString getGraphicsEngine();
+QString getOpenGLVersionString();
+float getOpenGLVersion();
+const QString & gitRevision();
+const QString & gitBranch();
+
+
 QByteArray gCompress(const QByteArray& data);
 QByteArray gUncompress(const QByteArray &data);
 

sleepyhead/UpdaterWindow.cpp

@@ -29,7 +29,6 @@
 #include "ui_UpdaterWindow.h"
 #include "version.h"
 #include "mainwindow.h"
-#include "common_gui.h"
 
 extern MainWindow *mainwin;
 

sleepyhead/aboutdialog.cpp

@@ -14,8 +14,6 @@
 #include "SleepLib/appsettings.h"
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
-#include "common_gui.h"
-#include "git_info.h"
 
 
 AboutDialog::AboutDialog(QWidget *parent) :
@@ -28,11 +26,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
     ui->relnotesText->setHtml(getRelnotes());
     ui->versionLabel->setText(VersionString);
 
-    QString gitrev = GIT_REVISION;
+    QString gitrev = gitRevision();
 
     if (!gitrev.isEmpty()) {
         gitrev = tr("Revision: %1").arg(QString("<a href='https://gitlab.com/sleepyhead/sleepyhead-code/commit/%1'>%1</a>").arg(gitrev))+"<br/>"
-                +tr("Branch: %1").arg(QString("<a href='https://gitlab.com/sleepyhead/sleepyhead-code/commits/%1'>%1</a>").arg(GIT_BRANCH))+"<br/>"
+                +tr("Branch: %1").arg(QString("<a href='https://gitlab.com/sleepyhead/sleepyhead-code/commits/%1'>%1</a>").arg(gitBranch()))+"<br/>"
                 +tr("Build Date: %1").arg(__DATE__)+"<br/>"
                 +tr("Graphics Engine: %1").arg(getGraphicsEngine());
     }

sleepyhead/common_gui.cpp

@@ -5,103 +5,8 @@
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
-
+#include <QColor>
-#include <QGLWidget>
+#include "Graphs/glcommon.h"
-#include <QOpenGLFunctions>
-#include <QDebug>
-#include <QDir>
-#include <QCoreApplication>
-
-#include "SleepLib/common.h"
-#include "common_gui.h"
-#include "git_info.h"
-
-#ifndef BUILD_WITH_MSVC
-# include <unistd.h>
-#endif
-
-QString getOpenGLVersionString()
-{
-    static QString glversion;
-
-    if (glversion.isEmpty()) {
-        QGLWidget w;
-        w.makeCurrent();
-
-#if QT_VERSION < QT_VERSION_CHECK(5,4,0)
-        glversion = QString(QLatin1String(reinterpret_cast<const char*>(glGetString(GL_VERSION))));
-#else
-        QOpenGLFunctions f;
-        f.initializeOpenGLFunctions();
-        glversion = QString(QLatin1String(reinterpret_cast<const char*>(f.glGetString(GL_VERSION))));
-#endif
-        qDebug() << "OpenGL Version:" << glversion;
-    }
-    return glversion;
-}
-
-float getOpenGLVersion()
-{
-    QString glversion = getOpenGLVersionString();
-    glversion = glversion.section(" ",0,0);
-    bool ok;
-    float v = glversion.toFloat(&ok);
-
-    if (!ok) {
-        QString tmp = glversion.section(".",0,1);
-        v = tmp.toFloat(&ok);
-        if (!ok) {
-            // just look at major, we are only interested in whether we have OpenGL 2.0 anyway
-            tmp = glversion.section(".",0,0);
-            v = tmp.toFloat(&ok);
-        }
-    }
-    return v;
-}
-
-QString getGraphicsEngine()
-{
-    QString gfxEngine = QString();
-#ifdef BROKEN_OPENGL_BUILD
-    gfxEngine = CSTR_GFX_BrokenGL;
-#else
-    QString glversion = getOpenGLVersionString();
-    if (glversion.contains(CSTR_GFX_ANGLE)) {
-        gfxEngine = CSTR_GFX_ANGLE;
-    } else {
-        gfxEngine = CSTR_GFX_OpenGL;
-    }
-#endif
-    return gfxEngine;
-}
-QString getBranchVersion()
-{
-    QString version = STR_TR_AppVersion;
-    version += " [";
-    if (GIT_BRANCH != "master") {
-        version += GIT_BRANCH+"-";
-    }
-    version += GIT_REVISION +" ";
-    version += getGraphicsEngine()+"]";
-
-    return version;
-}
-
-QString appResourcePath()
-{
-#ifdef Q_OS_MAC
-    QString path = QDir::cleanPath(QCoreApplication::applicationDirPath() + "/../Resources");
-#else
-    // not sure where it goes on Linux yet
-    QString path = QCoreApplication::applicationDirPath();
-#endif
-    return path;
-}
-
-Qt::DayOfWeek firstDayOfWeekFromLocale()
-{
-    return QLocale::system().firstDayOfWeek();
-}
 
 // Flag Colors
 QColor COLOR_Hypopnea       = Qt::blue;

sleepyhead/common_gui.h

@@ -9,20 +9,9 @@
 #ifndef COMMON_GUI_H
 #define COMMON_GUI_H
 
-#include <QLocale>
+#include <QString>
-#include "Graphs/glcommon.h"
+#include <QColor>
 
-//! \brief Gets the first day of week from the system locale, to show in the calendars.
-Qt::DayOfWeek firstDayOfWeekFromLocale();
-
-
-QString getBranchVersion();
-
-QString appResourcePath();
-
-const QString CSTR_GFX_ANGLE = "ANGLE";
-const QString CSTR_GFX_OpenGL = "OpenGL";
-const QString CSTR_GFX_BrokenGL = "QWidget";
 
 const QString STR_GRAPH_EventBreakdown = "EventBreakdown";
 const QString STR_GRAPH_SleepFlags = "SF";
@@ -36,9 +25,6 @@ const QString STR_GRAPH_AHI = "AHI";
 const QString STR_GRAPH_PeakAHI = "PeakAHI";
 
 //! \brief Returns a text string naming the current graphics engine
-QString getGraphicsEngine();
-QString getOpenGLVersionString();
-float getOpenGLVersion();
 
 
 // Flag Colors

sleepyhead/exportcsv.cpp

@@ -1,4 +1,4 @@
-/* ExportCSV module implementation
+/* ExportCSV module implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -13,7 +13,6 @@
 #include <QTextCharFormat>
 #include "SleepLib/profiles.h"
 #include "SleepLib/day.h"
-#include "common_gui.h"
 #include "exportcsv.h"
 #include "ui_exportcsv.h"
 #include "mainwindow.h"

sleepyhead/help.cpp

@@ -11,7 +11,7 @@
 #include <QDebug>
 #include <QTimer>
 
-#include "common_gui.h"
+#include "SleepLib/common.h"
 #include "help.h"
 #include "ui_help.h"
 

sleepyhead/main.cpp

@@ -19,8 +19,6 @@
 #include "mainwindow.h"
 #include "SleepLib/profiles.h"
 #include "translation.h"
-#include "common_gui.h"
-//#include "SleepLib/machine_loader.h"
 
 // Gah! I must add the real darn plugin system one day.
 #include "SleepLib/loader_plugins/prs1_loader.h"

sleepyhead/preferencesdialog.cpp

@@ -21,7 +21,6 @@
 #include <cmath>
 
 #include "preferencesdialog.h"
-#include "common_gui.h"
 
 #include <Graphs/gGraphView.h>
 #include <mainwindow.h>

sleepyhead/sessionbar.cpp

@@ -125,7 +125,7 @@ SegType SessionBar::max()
     return max;
 }
 
-QColor brighten(QColor, float f=2.0);
+QColor brighten(QColor, float f);
 
 void SessionBar::mousePressEvent(QMouseEvent *ev)
 {

sleepyhead/translation.cpp

@@ -20,7 +20,7 @@
 #include <QTranslator>
 #include <QListWidget>
 
-#include "common_gui.h"
+#include "SleepLib/common.h"
 
 //#ifndef nullptr
 //#define nullptr NULL