diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-07-08 15:07:18 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-07-08 15:25:14 +0200 |
| commit | 5d68428a0058649f07c9be3053bd58fd3462d6d9 (patch) | |
| tree | d411546fba10c3f661978d96cf03211a92406296 /fluid/proj | |
| parent | 3cf5a302fd2225b8d2622eb40e91262f4e7557c1 (diff) | |
Fix trailing whitespace and convert a few tabs to spaces
... according to CMP
Diffstat (limited to 'fluid/proj')
| -rw-r--r-- | fluid/proj/i18n.cxx | 2 | ||||
| -rw-r--r-- | fluid/proj/mergeback.cxx | 12 | ||||
| -rw-r--r-- | fluid/proj/undo.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fluid/proj/i18n.cxx b/fluid/proj/i18n.cxx index a00dcf2f2..247522dd3 100644 --- a/fluid/proj/i18n.cxx +++ b/fluid/proj/i18n.cxx @@ -63,7 +63,7 @@ void I18n::read(io::Project_Reader &f, const char *key) { gnu_conditional = f.read_word(); } else if (type == fld::I18n_Type::POSIX) { posix_conditional = f.read_word(); - } + } } } diff --git a/fluid/proj/mergeback.cxx b/fluid/proj/mergeback.cxx index 53ea93244..d9e5b0136 100644 --- a/fluid/proj/mergeback.cxx +++ b/fluid/proj/mergeback.cxx @@ -112,7 +112,7 @@ int merge_back(Project &proj, const std::string &s, const std::string &p, Mergeb } /** Allocate and initialize MergeBack class. */ -Mergeback::Mergeback(Project &proj) +Mergeback::Mergeback(Project &proj) : proj_(proj), code(nullptr), line_no(0), @@ -608,13 +608,13 @@ int Mergeback::merge_back(const std::string &s, const std::string &p, Task task) /** \brief Merges back code files with the project file. - This function flushes text widgets, checks if the project filename and - mergeback data are available, and then attempts to merge back the code - files with the project file. If MergeBack is not enabled, it displays + This function flushes text widgets, checks if the project filename and + mergeback data are available, and then attempts to merge back the code + files with the project file. If MergeBack is not enabled, it displays a message to the user. It handles both batch and interactive modes. - \return int - Returns 1 if the project filename is not available, - 0 if MergeBack is not enabled, + \return int - Returns 1 if the project filename is not available, + 0 if MergeBack is not enabled, or the result of the merge_back function. */ int mergeback_code_files(Project &proj) diff --git a/fluid/proj/undo.h b/fluid/proj/undo.h index f87c747bd..7bb02b72f 100644 --- a/fluid/proj/undo.h +++ b/fluid/proj/undo.h @@ -30,7 +30,7 @@ namespace proj { class Undo { public: - + enum class OnceType { ALWAYS = 0, WINDOW_RESIZE |