uni-days/sea_transport_project
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code style refactoring done

Browse source
This commit is contained in:
Andrew nuark G 2021-01-10 19:49:24 +07:00
parent 02766bd5d2
commit c5f1572efa
36 changed files with 202 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sea_transport/system/apparatus.cpp
View file

@ -77,7 +77,7 @@ void apparatus::load() {
f.close();
}
bool apparatus::isFirstRun() {
bool apparatus::is_first_run() {
return !QFile().exists("lock");
}
@ -94,7 +94,7 @@ void apparatus::init() {
throw std::runtime_error("System already initialized!");
}
bool fr = apparatus::isFirstRun();
bool fr = apparatus::is_first_run();
apparatus::_instance = new apparatus();
if (fr) {
@ -111,9 +111,10 @@ void apparatus::init() {
void apparatus::shutdown() {
apparatus::instance()->save();
if (apparatus::isFirstRun() && apparatus::instance()->get_auth_subsystem()->users().length() > 0) {
if (apparatus::is_first_run()
&& apparatus::instance()->get_auth_subsystem()->users().length() > 0) {
apparatus::generate_lock_file();
}
// delete apparatus::_instance;
apparatus::_instance = nullptr;
}

5
sea_transport/system/apparatus.h
View file

@ -12,8 +12,7 @@
#include <QDataStream>
class apparatus
{
class apparatus {
private:
static apparatus *_instance;
static const QString filename;
@ -31,7 +30,7 @@ public:
void save();
void load();
static bool isFirstRun();
static bool is_first_run();
static void generate_lock_file();
static apparatus* instance();
static void init();

3
sea_transport/system/auth_system.h
View file

@ -6,8 +6,7 @@
#include "../entities/user_entity.h"
class auth_system
{
class auth_system {
private:
QVector<user_entity> _users;
public:

3
sea_transport/system/object_system.h
View file

@ -7,8 +7,7 @@
#include "../entities/vessel_entity.h"
class object_system
{
class object_system {
private:
QVector<dpoint_entity> _dpoints;
QVector<vessel_entity> _vessels;