From 144765827fdfe459bd82be34661a51ffec415944 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 24 Jan 2016 03:14:09 +0100 Subject: GUI: Improve variable naming in PredictiveDialog. --- gui/predictivedialog.cpp | 12 ++++++------ gui/predictivedialog.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp index ad363da345..06dcd6750b 100644 --- a/gui/predictivedialog.cpp +++ b/gui/predictivedialog.cpp @@ -104,15 +104,15 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") { _userDictHasChanged = false; _predictiveDict.nameDict = "predictive_dictionary"; - _predictiveDict.fnameDict = "pred.dic"; + _predictiveDict.defaultFilename = "pred.dic"; _predictiveDict.dictActLine = NULL; _userDict.nameDict = "user_dictionary"; - _userDict.fnameDict = "user.dic"; + _userDict.defaultFilename = "user.dic"; _userDict.dictActLine = NULL; _unitedDict.nameDict = ""; - _unitedDict.fnameDict = ""; + _unitedDict.defaultFilename = ""; _predictiveDict.dictLine = NULL; _predictiveDict.dictText = NULL; @@ -997,19 +997,19 @@ void PredictiveDialog::loadDictionary(Common::SeekableReadStream *in, Dict &dict } void PredictiveDialog::loadAllDictionary(Dict &dict) { - ConfMan.registerDefault(dict.nameDict, dict.fnameDict); + ConfMan.registerDefault(dict.nameDict, dict.defaultFilename); if (dict.nameDict == "predictive_dictionary") { Common::File *inFile = new Common::File(); if (!inFile->open(ConfMan.get(dict.nameDict))) { - warning("Predictive Dialog: cannot read file: %s", dict.fnameDict.c_str()); + warning("Predictive Dialog: cannot read file: %s", dict.defaultFilename.c_str()); return; } loadDictionary(inFile, dict); } else { Common::InSaveFile *inFile = g_system->getSavefileManager()->openForLoading(ConfMan.get(dict.nameDict)); if (!inFile) { - warning("Predictive Dialog: cannot read file: %s", dict.fnameDict.c_str()); + warning("Predictive Dialog: cannot read file: %s", dict.defaultFilename.c_str()); return; } loadDictionary(inFile, dict); diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h index 7f9b31e2d3..9074089f1f 100644 --- a/gui/predictivedialog.h +++ b/gui/predictivedialog.h @@ -84,7 +84,7 @@ private: int32 dictLineCount; int32 dictTextSize; Common::String nameDict; - Common::String fnameDict; + Common::String defaultFilename; }; uint8 countWordsInString(const char *const str); -- cgit v1.2.3