diff options
| author | Petr Mrázek | 2012-03-03 14:38:24 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-03-03 14:38:24 +0100 |
| commit | 7fe8762852c11caeaeb486e9b76f024f5cbaf0d6 (patch) | |
| tree | 161c80a0738fa1d4d1b8fed845c59f29bd3abf9e /plugins/jobutils.cpp | |
| parent | 022822277d80152ca6ba4fad6102d68df35a7adc (diff) | |
| download | dfhack-7fe8762852c11caeaeb486e9b76f024f5cbaf0d6.tar.gz dfhack-7fe8762852c11caeaeb486e9b76f024f5cbaf0d6.tar.bz2 dfhack-7fe8762852c11caeaeb486e9b76f024f5cbaf0d6.tar.xz | |
Get rid of Simple namespace, Gui module is now a namespace.
Diffstat (limited to 'plugins/jobutils.cpp')
| -rw-r--r-- | plugins/jobutils.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/jobutils.cpp b/plugins/jobutils.cpp index 805fc545..e8141423 100644 --- a/plugins/jobutils.cpp +++ b/plugins/jobutils.cpp @@ -89,7 +89,7 @@ DFhackCExport command_result plugin_init (Core *c, std::vector <PluginCommand> & commands.push_back( PluginCommand( "job-duplicate", "Duplicate the selected job in a workshop.", - job_duplicate, workshop_job_hotkey, + job_duplicate, Gui::workshop_job_hotkey, " - In 'q' mode, when a job is highlighted within a workshop\n" " or furnace building, instantly duplicates the job.\n" ) @@ -108,15 +108,15 @@ DFhackCExport command_result plugin_shutdown ( Core * c ) static bool job_material_hotkey(Core *c, df::viewscreen *top) { - return workshop_job_hotkey(c, top) || - build_selector_hotkey(c, top); + return Gui::workshop_job_hotkey(c, top) || + Gui::build_selector_hotkey(c, top); } /* job-material implementation */ static command_result job_material_in_job(Core *c, MaterialInfo &new_mat) { - df::job *job = getSelectedWorkshopJob(c); + df::job *job = Gui::getSelectedWorkshopJob(c); if (!job) return CR_FAILURE; @@ -268,7 +268,7 @@ static command_result job_duplicate(Core * c, vector <string> & parameters) if (!parameters.empty()) return CR_WRONG_USAGE; - df::job *job = getSelectedWorkshopJob(c); + df::job *job = Gui::getSelectedWorkshopJob(c); if (!job) return CR_FAILURE; @@ -320,14 +320,14 @@ static command_result job_cmd(Core * c, vector <string> & parameters) std::string cmd = (parameters.empty() ? "query" : parameters[0]); if (cmd == "query" || cmd == "list") { - df::job *job = getSelectedJob(c); + df::job *job = Gui::getSelectedJob(c); if (!job) return CR_WRONG_USAGE; if (cmd == "query") { printJobDetails(c, job); } else { - if (!workshop_job_hotkey(c, c->getTopViewscreen())) + if (!Gui::workshop_job_hotkey(c, c->getTopViewscreen())) return CR_WRONG_USAGE; df::building *selected = world->selected_building; @@ -340,7 +340,7 @@ static command_result job_cmd(Core * c, vector <string> & parameters) if (parameters.size() != 3) return CR_WRONG_USAGE; - df::job *job = getSelectedJob(c); + df::job *job = Gui::getSelectedJob(c); df::job_item *item = getJobItem(c, job, parameters[1]); if (!item) return CR_WRONG_USAGE; @@ -384,7 +384,7 @@ static command_result job_cmd(Core * c, vector <string> & parameters) if (parameters.size() != 3) return CR_WRONG_USAGE; - df::job *job = getSelectedJob(c); + df::job *job = Gui::getSelectedJob(c); df::job_item *item = getJobItem(c, job, parameters[1]); if (!item) return CR_WRONG_USAGE; |
