From 22038552070b4b73218c01af099594ad6fe69217 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 6 Jun 2021 08:20:04 +0300 Subject: [PATCH 49/49] Ruledit: Rename "...rec_vec..." as "...req_vec..." That "req" refers to requirement. See osdn #42477 Signed-off-by: Marko Lindqvist --- tools/ruledit/req_edit.cpp | 10 +++++----- tools/ruledit/req_edit.h | 4 ++-- tools/ruledit/req_vec_fix.cpp | 10 +++++----- tools/ruledit/req_vec_fix.h | 4 ++-- tools/ruledit/ruledit_qt.cpp | 12 ++++++------ tools/ruledit/ruledit_qt.h | 4 ++-- tools/ruledit/tab_enablers.cpp | 6 +++--- tools/ruledit/tab_enablers.h | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/ruledit/req_edit.cpp b/tools/ruledit/req_edit.cpp index ceeca6e921..844c671f11 100644 --- a/tools/ruledit/req_edit.cpp +++ b/tools/ruledit/req_edit.cpp @@ -52,8 +52,8 @@ req_edit::req_edit(ruledit_gui *ui_in, QString target, QLabel *lbl; ui = ui_in; - connect(ui, SIGNAL(rec_vec_may_have_changed(const requirement_vector *)), - this, SLOT(incoming_rec_vec_change(const requirement_vector *))); + connect(ui, SIGNAL(req_vec_may_have_changed(const requirement_vector *)), + this, SLOT(incoming_req_vec_change(const requirement_vector *))); clear_selected(); req_vector = preqs; @@ -419,7 +419,7 @@ void req_edit::add_now() refresh(); - emit rec_vec_may_have_changed(req_vector); + emit req_vec_may_have_changed(req_vector); } /**********************************************************************//** @@ -441,7 +441,7 @@ void req_edit::delete_now() refresh(); - emit rec_vec_may_have_changed(req_vector); + emit req_vec_may_have_changed(req_vector); } } @@ -449,7 +449,7 @@ void req_edit::delete_now() The requirement vector may have been changed. @param vec the requirement vector that may have been changed. **************************************************************************/ -void req_edit::incoming_rec_vec_change(const requirement_vector *vec) +void req_edit::incoming_req_vec_change(const requirement_vector *vec) { if (req_vector == vec) { /* The selected requirement may be gone */ diff --git a/tools/ruledit/req_edit.h b/tools/ruledit/req_edit.h index 3a633d6e6c..0773ea6e34 100644 --- a/tools/ruledit/req_edit.h +++ b/tools/ruledit/req_edit.h @@ -49,7 +49,7 @@ signals: A requirement vector may have been changed. @param vec the requirement vector that was changed. ************************************************************************/ - void rec_vec_may_have_changed(const requirement_vector *vec); + void req_vec_may_have_changed(const requirement_vector *vec); private: ruledit_gui *ui; @@ -83,7 +83,7 @@ signals: void univ_value_enum_menu(QAction *action); void univ_value_edit(int value); - void incoming_rec_vec_change(const requirement_vector *vec); + void incoming_req_vec_change(const requirement_vector *vec); protected: void closeEvent(QCloseEvent *event); diff --git a/tools/ruledit/req_vec_fix.cpp b/tools/ruledit/req_vec_fix.cpp index a2dd35c71d..98196a33bb 100644 --- a/tools/ruledit/req_vec_fix.cpp +++ b/tools/ruledit/req_vec_fix.cpp @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 2020 - The Freeciv Project contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -147,8 +147,8 @@ req_vec_fix::req_vec_fix(ruledit_gui *ui_in, QHBoxLayout *layout_buttons = new QHBoxLayout(); this->ui = ui_in; - connect(ui, SIGNAL(rec_vec_may_have_changed(const requirement_vector *)), - this, SLOT(incoming_rec_vec_change(const requirement_vector *))); + connect(ui, SIGNAL(req_vec_may_have_changed(const requirement_vector *)), + this, SLOT(incoming_req_vec_change(const requirement_vector *))); this->item_info = item; @@ -309,7 +309,7 @@ void req_vec_fix::accept_applied_solutions() this->refresh(); for (i = 0; i < item_info->num_vectors(); i++) { - emit rec_vec_may_have_changed(item_info->vector_getter() + emit req_vec_may_have_changed(item_info->vector_getter() (item_info->item(), i)); } } @@ -332,7 +332,7 @@ void req_vec_fix::reject_applied_solutions() A requirement vector may have been changed. @param vec the requirement vector that may have been changed. **************************************************************************/ -void req_vec_fix::incoming_rec_vec_change(const requirement_vector *vec) +void req_vec_fix::incoming_req_vec_change(const requirement_vector *vec) { if (this->item_info->vector_in_item(vec)) { /* Can't trust the changes done against a previous version. */ diff --git a/tools/ruledit/req_vec_fix.h b/tools/ruledit/req_vec_fix.h index 11d3fad401..462def7469 100644 --- a/tools/ruledit/req_vec_fix.h +++ b/tools/ruledit/req_vec_fix.h @@ -171,7 +171,7 @@ signals: A requirement vector may have been changed. @param vec the requirement vector that was changed. ************************************************************************/ - void rec_vec_may_have_changed(const requirement_vector *vec); + void req_vec_may_have_changed(const requirement_vector *vec); private: struct req_vec_problem *current_problem; @@ -189,7 +189,7 @@ private slots: void accept_applied_solutions(); void reject_applied_solutions(); - void incoming_rec_vec_change(const requirement_vector *vec); + void incoming_req_vec_change(const requirement_vector *vec); }; #endif /* FC__REQ_VEC_FIX_H */ diff --git a/tools/ruledit/ruledit_qt.cpp b/tools/ruledit/ruledit_qt.cpp index 3b964680af..3b7dc22350 100644 --- a/tools/ruledit/ruledit_qt.cpp +++ b/tools/ruledit/ruledit_qt.cpp @@ -260,9 +260,9 @@ void ruledit_gui::launch_now() A requirement vector may have been changed. @param vec the requirement vector that may have been changed. **************************************************************************/ -void ruledit_gui::incoming_rec_vec_change(const requirement_vector *vec) +void ruledit_gui::incoming_req_vec_change(const requirement_vector *vec) { - emit rec_vec_may_have_changed(vec); + emit req_vec_may_have_changed(vec); } /**********************************************************************//** @@ -326,8 +326,8 @@ void ruledit_gui::open_req_edit(QString target, struct requirement_vector *preqs redit->show(); connect(redit, - SIGNAL(rec_vec_may_have_changed(const requirement_vector *)), - this, SLOT(incoming_rec_vec_change(const requirement_vector *))); + SIGNAL(req_vec_may_have_changed(const requirement_vector *)), + this, SLOT(incoming_req_vec_change(const requirement_vector *))); req_edit_list_append(req_edits, redit); } @@ -362,8 +362,8 @@ void ruledit_gui::open_req_vec_fix(req_vec_fix_item *item_info) fixer->show(); connect(fixer, - SIGNAL(rec_vec_may_have_changed(const requirement_vector *)), - this, SLOT(incoming_rec_vec_change(const requirement_vector *))); + SIGNAL(rec_veq_may_have_changed(const requirement_vector *)), + this, SLOT(incoming_req_vec_change(const requirement_vector *))); req_vec_fix_list_append(req_vec_fixers, fixer); } diff --git a/tools/ruledit/ruledit_qt.h b/tools/ruledit/ruledit_qt.h index 6f852e8b20..3e98dce165 100644 --- a/tools/ruledit/ruledit_qt.h +++ b/tools/ruledit/ruledit_qt.h @@ -116,7 +116,7 @@ signals: A requirement vector may have been changed. @param vec the requirement vector that was changed. ************************************************************************/ - void rec_vec_may_have_changed(const requirement_vector *vec); + void req_vec_may_have_changed(const requirement_vector *vec); private: QLabel *msg_dspl; @@ -143,7 +143,7 @@ signals: private slots: void launch_now(); - void incoming_rec_vec_change(const requirement_vector *vec); + void incoming_req_vec_change(const requirement_vector *vec); }; int ruledit_qt_run(int argc, char **argv); diff --git a/tools/ruledit/tab_enablers.cpp b/tools/ruledit/tab_enablers.cpp index f48bbfcd96..55242a8a6d 100644 --- a/tools/ruledit/tab_enablers.cpp +++ b/tools/ruledit/tab_enablers.cpp @@ -98,8 +98,8 @@ tab_enabler::tab_enabler(ruledit_gui *ui_in) : QWidget() QPushButton *add_button; ui = ui_in; - connect(ui, SIGNAL(rec_vec_may_have_changed(const requirement_vector *)), - this, SLOT(incoming_rec_vec_change(const requirement_vector *))); + connect(ui, SIGNAL(req_vec_may_have_changed(const requirement_vector *)), + this, SLOT(incoming_req_vec_change(const requirement_vector *))); selected = 0; @@ -346,7 +346,7 @@ void tab_enabler::repair_now() A requirement vector may have been changed. @param vec the requirement vector that may have been changed. **************************************************************************/ -void tab_enabler::incoming_rec_vec_change(const requirement_vector *vec) +void tab_enabler::incoming_req_vec_change(const requirement_vector *vec) { action_enablers_iterate(enabler) { if (&enabler->actor_reqs == vec || &enabler->target_reqs == vec) { diff --git a/tools/ruledit/tab_enablers.h b/tools/ruledit/tab_enablers.h index c6346d8e19..53b09304a1 100644 --- a/tools/ruledit/tab_enablers.h +++ b/tools/ruledit/tab_enablers.h @@ -60,7 +60,7 @@ class tab_enabler : public QWidget void select_enabler(); void add_now(); void repair_now(); - void incoming_rec_vec_change(const requirement_vector *vec); + void incoming_req_vec_change(const requirement_vector *vec); void delete_now(); void edit_type(QAction *action); void edit_target_reqs(); -- 2.30.2