diff options
| author | Matthias Melcher <github@matthiasm.com> | 2025-03-07 16:34:35 +0100 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2025-03-07 16:34:48 +0100 |
| commit | 1985aefc0e502048f92b91beef87c0dfbe669fed (patch) | |
| tree | af62874def4590e437a47784b4428d975ceb262f /fluid/mergeback.h | |
| parent | 42a04c064d4b31c3a85210311f3ada163c406a25 (diff) | |
Restructuring Fluid source files.
Diffstat (limited to 'fluid/mergeback.h')
| -rw-r--r-- | fluid/mergeback.h | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/fluid/mergeback.h b/fluid/mergeback.h deleted file mode 100644 index f828e9669..000000000 --- a/fluid/mergeback.h +++ /dev/null @@ -1,81 +0,0 @@ -// -// MergeBack routines for the Fast Light Tool Kit (FLTK). -// -// Copyright 2023 by Bill Spitzak and others. -// -// This library is free software. Distribution and use rights are outlined in -// the file "COPYING" which should have been included with this file. If this -// file is missing or damaged, see the license at: -// -// https://www.fltk.org/COPYING.php -// -// Please see the following page on how to report bugs and issues: -// -// https://www.fltk.org/bugs.php -// - -// Matt: disabled -#if 0 - -#ifndef _FLUID_MERGEBACK_H -#define _FLUID_MERGEBACK_H - -#include <FL/fl_attr.h> - -#include <stdio.h> -#include <string> - -const int FD_TAG_GENERIC = 0; -const int FD_TAG_CODE = 1; -const int FD_TAG_MENU_CALLBACK = 2; -const int FD_TAG_WIDGET_CALLBACK = 3; -const int FD_TAG_LAST = 3; - -const int FD_MERGEBACK_ANALYSE = 0; -const int FD_MERGEBACK_INTERACTIVE = 1; -const int FD_MERGEBACK_APPLY = 2; -const int FD_MERGEBACK_APPLY_IF_SAFE = 3; - -/** Class that implements the MergeBack functionality. - \see merge_back(const std::string &s, int task) - */ -class Fd_Mergeback -{ -protected: - /// Pointer to the C++ code file. - FILE *code; - /// Current line number in the C++ code file. - int line_no; - /// Set if there was an error reading a tag. - int tag_error; - /// Number of code blocks that were different than the CRC in their tag. - int num_changed_code; - /// Number of generic structure blocks that were different than the CRC in their tag. - int num_changed_structure; - /// Number of code block that were modified, but a type node by that uid was not found. - int num_uid_not_found; - /// Number of modified code block where the corresponding project block also changed. - int num_possible_override; - - void unindent(char *s); - std::string read_and_unindent_block(long start, long end); - void analyse_callback(unsigned long code_crc, unsigned long tag_crc, int uid); - void analyse_code(unsigned long code_crc, unsigned long tag_crc, int uid); - int apply_callback(long block_end, long block_start, unsigned long code_crc, int uid); - int apply_code(long block_end, long block_start, unsigned long code_crc, int uid); - -public: - Fd_Mergeback(); - ~Fd_Mergeback(); - int merge_back(const std::string &s, const std::string &p, int task); - int ask_user_to_merge(const std::string &s, const std::string &p); - int analyse(); - int apply(); -}; - -extern int merge_back(const std::string &s, const std::string &p, int task); - - -#endif // _FLUID_MERGEBACK_H - -#endif |
