From 3e5c5745fb9892e97d8f825cbebb150c35a40bab Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Thu, 6 Mar 2014 20:24:05 +0000 Subject: [PATCH] More BOSS/LOOT search/replace. --- src/api/api.cpp | 4 ++-- src/api/api.h | 4 ++-- src/backend/legacy-parser.h | 8 ++++---- src/gui/main.cpp | 4 ++-- src/gui/main.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api/api.cpp b/src/api/api.cpp index 130cd91e..4ffd93e3 100644 --- a/src/api/api.cpp +++ b/src/api/api.cpp @@ -287,7 +287,7 @@ LOOT_API unsigned int loot_load_lists (loot_db db, const char * const masterlist else { boost::filesystem::path p(masterlistPath); std::list filler; - Loadv2Masterlist(p, temp, filler); + LoadBOSSMasterlist(p, temp, filler); } } } catch (std::exception& e) { @@ -579,7 +579,7 @@ LOOT_API unsigned int loot_get_plugin_tags (loot_db db, const char * const plugi } // Returns the messages attached to the given plugin. Messages are valid until Load, -// DestroyBossDb or GetPluginMessages are next called. plugin is case-insensitive. +// loot_destroy_db or loot_get_plugin_messages are next called. plugin is case-insensitive. // If no messages are attached, *messages will be NULL and numMessages will equal 0. LOOT_API unsigned int loot_get_plugin_messages (loot_db db, const char * const plugin, loot_message ** const messages, diff --git a/src/api/api.h b/src/api/api.h index be94c70d..2bb1ec7b 100644 --- a/src/api/api.h +++ b/src/api/api.h @@ -272,7 +272,7 @@ LOOT_API void loot_destroy_db (loot_db db); @brief Loads the masterlist and userlist from the paths specified. @details Can be called multiple times, each time replacing the previously-loaded data. @param db The database the function acts on. - @param masterlistPath A string containing the relative or absolute path to the masterlist file that should be loaded. The API supports loading both v3 and v2.3 masterlists. + @param masterlistPath A string containing the relative or absolute path to the masterlist file that should be loaded. The API supports loading both LOOT and BOSS masterlists. @param userlistPath A string containing the relative or absolute path to the userlist file that should be loaded, or `NULL`. If `NULL`, no userlist will be loaded. The API only upports loading v3 userlists. @returns A return code. */ @@ -344,7 +344,7 @@ LOOT_API unsigned int loot_get_plugin_messages (loot_db db, const char * const p @param db The database the function acts on. @param plugin The plugin to look up dirty status information for. @param needsCleaning A pointer to a plugin cleanliness code. - @returns A return code. + @returns A return code. */ LOOT_API unsigned int loot_get_dirty_info (loot_db db, const char * const plugin, diff --git a/src/backend/legacy-parser.h b/src/backend/legacy-parser.h index 4397e350..8cf99618 100644 --- a/src/backend/legacy-parser.h +++ b/src/backend/legacy-parser.h @@ -25,7 +25,7 @@ #ifndef __LOOT_LEGACY_PARSER__ #define __LOOT_LEGACY_PARSER__ -// This file holds the code necessary for inputting a v2 masterlist and getting a list of plugins and a list of global messages from it. +// This file holds the code necessary for inputting a BOSS masterlist and getting a list of plugins and a list of global messages from it. #ifndef BOOST_SPIRIT_UNICODE #define BOOST_SPIRIT_UNICODE @@ -412,9 +412,9 @@ namespace loot { } void ConvertCondition(std::string& condition) { - /*Convert the v2 order of evaluation to the standard order. + /*Convert the BOSS order of evaluation to the standard order. The only consistent way to do this is to bracket everything, - which is supported by the v3 syntax. */ + which is supported by the LOOT syntax. */ int bracketNo = 0; size_t pos = 0; @@ -796,7 +796,7 @@ namespace loot { } }; - void Loadv2Masterlist(boost::filesystem::path& file, std::list& plugins, std::list& globalMessages) { + void LoadBOSSMasterlist(boost::filesystem::path& file, std::list& plugins, std::list& globalMessages) { Skipper skipper; LegacyMasterlistGrammar grammar; std::string::const_iterator begin, end; diff --git a/src/gui/main.cpp b/src/gui/main.cpp index fda880ee..d2144e4e 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -63,7 +63,7 @@ #define BOOST_THREAD_VERSION 4 -wxIMPLEMENT_APP(BossGUI); +wxIMPLEMENT_APP(LOOT); using namespace loot; using namespace std; @@ -157,7 +157,7 @@ struct masterlist_updater_parser { string& _revision; }; -bool BossGUI::OnInit() { +bool LOOT::OnInit() { //Check if GUI is already running. wxSingleInstanceChecker *checker = new wxSingleInstanceChecker; diff --git a/src/gui/main.h b/src/gui/main.h index abf8ca60..b61b5a17 100644 --- a/src/gui/main.h +++ b/src/gui/main.h @@ -33,7 +33,7 @@ #include //Program class. -class BossGUI : public wxApp { +class LOOT : public wxApp { public: bool OnInit(); //Load settings, apply logging and language settings, check if LOOT is already running, detect games, set game to last game or to first detected game if auto, create launcher window. private: