diff options
| author | Matthias Melcher <github@matthiasm.com> | 2026-01-04 20:43:26 +0100 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2026-01-04 20:43:34 +0100 |
| commit | 7306b66d99fb529d65ddda1ea8e093454d7005e1 (patch) | |
| tree | 13803f53b2e921985abe54804b8d9131c46b9c3d /fluid/proj/mergeback.h | |
| parent | 811a188bbf276841365f2ad4b11197f5820fe571 (diff) | |
Fluid: Add automated MergeBack
Diffstat (limited to 'fluid/proj/mergeback.h')
| -rw-r--r-- | fluid/proj/mergeback.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fluid/proj/mergeback.h b/fluid/proj/mergeback.h index f395717f8..a515b1815 100644 --- a/fluid/proj/mergeback.h +++ b/fluid/proj/mergeback.h @@ -35,13 +35,14 @@ namespace proj { */ class Mergeback { - public: +public: enum class Tag { GENERIC = 0, CODE, MENU_CALLBACK, WIDGET_CALLBACK, UNUSED_ }; enum class Task { ANALYSE = 0, INTERACTIVE, APPLY, APPLY_IF_SAFE = 3 }; + enum Feedback { QUIET = 0, CHATTY = 1 }; protected: /// Apply mergeback for this project. Project &proj_; @@ -88,5 +89,8 @@ extern int merge_back(const std::string &s, const std::string &p, int task); } // namespace proj } // namespace fld +extern void start_auto_mergeback(); +extern void mergeback_on_load(); + #endif // FLUID_PROJ_MERGEBACK_H |