valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix effc++ warnings in control.h

Browse source
This commit is contained in:
Patryk Obara 2020-03-17 13:41:25 +01:00 • committed by Patryk Obara
parent 919099c757
commit bf1c7eef18
2 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
include/control.h
View file

@ -19,30 +19,15 @@
#ifndef DOSBOX_CONTROL_H
#define DOSBOX_CONTROL_H
#ifndef DOSBOX_PROGRAMS_H
#include "programs.h"
#endif
#ifndef DOSBOX_SETUP_H
#include "setup.h"
#endif
#include "dosbox.h"
#ifndef CH_LIST
#define CH_LIST
#include <cassert>
#include <list>
#endif
#ifndef CH_VECTOR
#define CH_VECTOR
#include <vector>
#endif
#ifndef CH_STRING
#define CH_STRING
#include <string>
#endif
#include <vector>
#include "programs.h"
#include "setup.h"
class Config{
public:
@ -56,14 +41,25 @@ private:
void (* _start_function)(void);
bool secure_mode; //Sandbox mode
public:
bool initialised;
std::vector<std::string> startup_params;
std::vector<std::string> configfiles;
Config(CommandLine * cmd):cmdline(cmd),secure_mode(false) {
Config(CommandLine *cmd)
: cmdline(cmd),
sectionlist{},
_start_function(nullptr),
secure_mode(false),
startup_params{},
configfiles{}
{
assert(cmdline);
startup_params.push_back(cmdline->GetFileName());
cmdline->FillVector(startup_params);
initialised=false;
}
Config(const Config&) = delete; // prevent copying
Config& operator=(const Config&) = delete; // prevent assignment
~Config();
Section_line * AddSection_line(char const * const _name,void (*_initfunction)(Section*));