diff options
| author | Patric Stout <truebrain@openttd.org> | 2021-07-01 19:59:13 +0200 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2021-07-02 14:30:14 +0200 |
| commit | 66dc0ce1965bd033b6b52712c3db7a768ff2fba9 (patch) | |
| tree | 31db681e156ac1a42982c048cb18878fb2169743 /src/window.cpp | |
| parent | a42251fc72d2196c26abfcc77c7fe0277798d3d4 (diff) | |
| download | openttd-66dc0ce1965bd033b6b52712c3db7a768ff2fba9.tar.xz | |
Codechange: C++-ify the usage of IniFile in settings.cpp
Instead of creating the object on heap and use a pointer, create
the object on stack and use a guaranteed-not-null pointer.
The size of IniFile doesn't warrent the forcing to heap.
Additionally, use a subclass instead of a function to do some
initial bookkeeping on an IniFile meant to read a configuration.
Diffstat (limited to 'src/window.cpp')
| -rw-r--r-- | src/window.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/window.cpp b/src/window.cpp index ef15a3ed2..1c2a305ba 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -153,13 +153,12 @@ int16 WindowDesc::GetDefaultHeight() const */ void WindowDesc::LoadFromConfig() { - IniFile *ini = new IniFile(); - ini->LoadFromDisk(_windows_file, NO_DIRECTORY); + IniFile ini; + ini.LoadFromDisk(_windows_file, NO_DIRECTORY); for (WindowDesc *wd : *_window_descs) { if (wd->ini_key == nullptr) continue; IniLoadWindowSettings(ini, wd->ini_key, wd); } - delete ini; } /** @@ -179,14 +178,13 @@ void WindowDesc::SaveToConfig() /* Sort the stuff to get a nice ini file on first write */ std::sort(_window_descs->begin(), _window_descs->end(), DescSorter); - IniFile *ini = new IniFile(); - ini->LoadFromDisk(_windows_file, NO_DIRECTORY); + IniFile ini; + ini.LoadFromDisk(_windows_file, NO_DIRECTORY); for (WindowDesc *wd : *_window_descs) { if (wd->ini_key == nullptr) continue; IniSaveWindowSettings(ini, wd->ini_key, wd); } - ini->SaveToDisk(_windows_file); - delete ini; + ini.SaveToDisk(_windows_file); } /** |