Skip to content

Commit fd4ed48

Browse files
committed
Corrected order.
1 parent 70ba3be commit fd4ed48

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/Configs.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,21 @@ void Configs::loadCoders(const Options &options,vector<Config> &configs)
104104
}
105105
}
106106

107+
Config Configs::loadConfig(const Options &options,const wstring &name,const wstring &directory)
108+
{
109+
const auto projectDirectory=options.rootDirectory + L"Configure\\Configs\\" + name;
110+
if (!filesystem::exists(projectDirectory))
111+
throwException(L"Cannot find project directory");
112+
113+
return(Config::load(name,directory + L"\\",projectDirectory + L"\\Config.txt"));
114+
}
115+
116+
void Configs::loadConfig(const Options &options,const wstring &name,const wstring &directory,vector<Config> &configs)
117+
{
118+
Config config=loadConfig(options,name,directory);
119+
addConfig(config,options,configs);
120+
}
121+
107122
void Configs::loadDirectory(const Options &options,const wstring directory,vector<Config> &configs)
108123
{
109124
const auto fullProjectDirectory=options.rootDirectory + L"\\" + directory;
@@ -124,21 +139,6 @@ void Configs::loadDirectory(const Options &options,const wstring directory,vecto
124139
}
125140
}
126141

127-
Config Configs::loadConfig(const Options &options,const wstring &name,const wstring &directory)
128-
{
129-
const auto projectDirectory=options.rootDirectory + L"Configure\\Configs\\" + name;
130-
if (!filesystem::exists(projectDirectory))
131-
throwException(L"Cannot find project directory");
132-
133-
return(Config::load(name,directory + L"\\",projectDirectory + L"\\Config.txt"));
134-
}
135-
136-
void Configs::loadConfig(const Options &options,const wstring &name,const wstring &directory,vector<Config> &configs)
137-
{
138-
Config config=loadConfig(options,name,directory);
139-
addConfig(config,options,configs);
140-
}
141-
142142
void Configs::removeInvalidReferences(const Options &options,vector<Config> &configs)
143143
{
144144
for (auto& config : configs)

src/Configs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class Configs
3333

3434
static void loadCoders(const Options &options,vector<Config> &configs);
3535

36-
static void loadDirectory(const Options &options,const wstring directory,vector<Config> &configs);
37-
3836
static Config loadConfig(const Options &options,const wstring &name,const wstring &directory);
3937

4038
static void loadConfig(const Options &options,const wstring &name,const wstring &directory,vector<Config> &configs);
4139

40+
static void loadDirectory(const Options &options,const wstring directory,vector<Config> &configs);
41+
4242
static void removeInvalidReferences(const Options &options,vector<Config> &configs);
4343

4444
static void validate(const Options &options,const vector<Config> &configs);

0 commit comments

Comments
 (0)