chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-12 16:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move version constants out of header file into new cpp file.

Browse Source
This commit is contained in:
sawinglogz 2020-01-13 18:18:14 -05:00
parent cb036c4497
commit 097362dfa1
7 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/Graphs/gGraphView.cpp
View File

@ -1,5 +1,6 @@
/* gGraphView Implementation /* gGraphView Implementation
* *
* Copyright (c) 2020 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -1359,7 +1360,6 @@ bool gGraphView::renderGraphs(QPainter &painter)
return numgraphs > 0; return numgraphs > 0;
} }
#include "version.h"
#ifdef BROKEN_OPENGL_BUILD #ifdef BROKEN_OPENGL_BUILD
void gGraphView::paintEvent(QPaintEvent *) void gGraphView::paintEvent(QPaintEvent *)
#else #else

3
oscar/SleepLib/profiles.h
View File

@ -1,6 +1,6 @@
/* SleepLib Profiles Header /* SleepLib Profiles Header
* *
* Copyright (c) 2019 The OSCAR Team * Copyright (c) 2019-2020 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -14,7 +14,6 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QThread> #include <QThread>
#include "version.h"
#include "progressdialog.h" #include "progressdialog.h"
#include "machine.h" #include "machine.h"
#include "machine_loader.h" #include "machine_loader.h"

4
oscar/UpdaterWindow.h
View File

@ -1,5 +1,6 @@
/* UpdaterWindow /* UpdaterWindow
* *
* Copyright (c) 2020 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -16,7 +17,6 @@
#include <QMainWindow> #include <QMainWindow>
#include <QUrl> #include <QUrl>
#include "version.h"
#include "updateparser.h" #include "updateparser.h"
namespace Ui { namespace Ui {

3
oscar/mainwindow.cpp
View File

@ -1,5 +1,6 @@
/* OSCAR MainWindow Implementation /* OSCAR MainWindow Implementation
* *
* Copyright (c) 2020 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public

1
oscar/oscar.pro
View File

@ -256,6 +256,7 @@ SOURCES += \
sessionbar.cpp \ sessionbar.cpp \
updateparser.cpp \ updateparser.cpp \
UpdaterWindow.cpp \ UpdaterWindow.cpp \
version.cpp \
Graphs/gFlagsLine.cpp \ Graphs/gFlagsLine.cpp \
Graphs/gFooBar.cpp \ Graphs/gFooBar.cpp \
Graphs/gGraph.cpp \ Graphs/gGraph.cpp \

30
oscar/version.cpp Normal file
View File

@ -0,0 +1,30 @@
/* Version management
*
* Copyright (c) 2020 The OSCAR Team
*
* 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 "version.h"
const int major_version = 1; // incompatible API changes
const int minor_version = 1; // new features that don't break things
const int revision_number = 0; // bugfixes, revisions
const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
#include "build_number.h"
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);
#ifdef Q_OS_MAC
const QString PlatformString = "MacOSX";
#elif defined(Q_OS_WIN32)
const QString PlatformString = "Win32";
#elif defined(Q_OS_WIN64)
const QString PlatformString = "Win64";
#elif defined(Q_OS_LINUX)
const QString PlatformString = "Linux";
#elif defined(Q_OS_HAIKU)
const QString PlatformString = "Haiku";
#endif

31
oscar/version.h
View File

@ -1,5 +1,6 @@
/* Version.h /* Version.h
* *
* Copyright (c) 2020 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -9,27 +10,17 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#include <qglobal.h> #include <QString>
#include "build_number.h"
const int major_version = 1; // incompatible API changes extern const int major_version;
const int minor_version = 1; // new features that don't break things extern const int minor_version;
const int revision_number = 0; // bugfixes, revisions extern const int revision_number;
const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable extern const QString ReleaseStatus;
extern const int build_number;
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number); extern const QString VersionString;
const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); extern const QString ShortVersionString;
#ifdef Q_OS_MAC extern const QString PlatformString;
const QString PlatformString = "MacOSX";
#elif defined(Q_OS_WIN32)
const QString PlatformString = "Win32";
#elif defined(Q_OS_WIN64)
const QString PlatformString = "Win64";
#elif defined(Q_OS_LINUX)
const QString PlatformString = "Linux";
#elif defined(Q_OS_HAIKU)
const QString PlatformString = "Haiku";
#endif
#endif // VERSION_H #endif // VERSION_H