wip

1 files changed, 10 insertions, 10 deletions

diff --git a/fluid/proj/mergeback.cxx b/fluid/proj/mergeback.cxx
index 2d553aedb..827a9505b 100644
--- a/fluid/proj/mergeback.cxx
+++ b/fluid/proj/mergeback.cxx
@@ -91,7 +91,7 @@ extern void redraw_browser();
  Returns 0 if nothing changed, and 1 if it merged any changes back, and -1 if
  there were conflicts.
 
- \note this function is currently part of fld::io::Code_Writer to get easy access
+ \note this function is currently part of Code_Writer to get easy access
  to our crc32 code that also wrote the code file originally.
 
  \param[in] s path and filename of the source code file
@@ -100,7 +100,7 @@ extern void redraw_browser();
  \return -2 if no code file was found
  \return see above
  */
-static int merge_back(fld::Project &proj, const char *s, const char *p, Mergeback::Task task) {
+static int merge_back(Project &proj, const char *s, const char *p, Mergeback::Task task) {
   if (proj.write_mergeback_data) {
     Mergeback mergeback(proj);
     return mergeback.merge_back(s, p, task);
@@ -111,7 +111,7 @@ static int merge_back(fld::Project &proj, const char *s, const char *p, Mergebac
 }
 
 /** Allocate and initialize MergeBack class. */
-Mergeback::Mergeback(fld::Project &proj)
+Mergeback::Mergeback(Project &proj)
 : proj_(proj),
   code(0),
   line_no(0),
@@ -253,7 +253,7 @@ void Mergeback::analyse_callback(unsigned long code_crc, unsigned long tag_crc,
     if (cb && len) memcpy(cb_nl, cb, len);
     cb_nl[len] = '\n';
     cb_nl[len + 1] = '\0';
-    unsigned long project_crc = fld::io::Code_Writer::block_crc(cb_nl);
+    unsigned long project_crc = Code_Writer::block_crc(cb_nl);
     free(cb_nl);
     // check if the code and project crc are the same, so this modification was already applied
     if (project_crc!=code_crc) {
@@ -281,7 +281,7 @@ void Mergeback::analyse_code(unsigned long code_crc, unsigned long tag_crc, int
     if (code && len) memcpy(code_nl, code, len);
     code_nl[len] = '\n';
     code_nl[len + 1] = '\0';
-    unsigned long project_crc = fld::io::Code_Writer::block_crc(code_nl);
+    unsigned long project_crc = Code_Writer::block_crc(code_nl);
     free(code_nl);
     // check if the code and project crc are the same, so this modification was already applied
     if (project_crc!=code_crc) {
@@ -448,7 +448,7 @@ int Mergeback::analyse() {
     const char *tag = find_mergeback_tag(line);
     if (!tag) {
       // if this line has no tag, add the contents to the CRC and continue
-      code_crc = fld::io::Code_Writer::block_crc(line, -1, code_crc, &line_start);
+      code_crc = Code_Writer::block_crc(line, -1, code_crc, &line_start);
     } else {
       // if this line has a tag, read all tag data
       Tag tag_type = FLD_MERGEBACK_TAG_UNUSED_;
@@ -494,7 +494,7 @@ int Mergeback::apply_callback(long block_end, long block_start, unsigned long co
     if (cb && len) memcpy(cb_nl, cb, len);
     cb_nl[len] = '\n';
     cb_nl[len + 1] = '\0';
-    unsigned long project_crc = fld::io::Code_Writer::block_crc(cb_nl);
+    unsigned long project_crc = Code_Writer::block_crc(cb_nl);
     free(cb_nl);
     if (project_crc!=code_crc) {
       char *block = read_and_unindent_block(block_start, block_end);
@@ -518,7 +518,7 @@ int Mergeback::apply_code(long block_end, long block_start, unsigned long code_c
     if (code && len) memcpy(code_nl, code, len);
     code_nl[len] = '\n';
     code_nl[len + 1] = '\0';
-    unsigned long project_crc = fld::io::Code_Writer::block_crc(code_nl);
+    unsigned long project_crc = Code_Writer::block_crc(code_nl);
     free(code_nl);
     if (project_crc!=code_crc) {
       char *block = read_and_unindent_block(block_start, block_end);
@@ -557,7 +557,7 @@ int Mergeback::apply() {
     const char *tag = find_mergeback_tag(line);
     if (!tag) {
       // if this line has no tag, add the contents to the CRC and continue
-      code_crc = fld::io::Code_Writer::block_crc(line, -1, code_crc, &line_start);
+      code_crc = Code_Writer::block_crc(line, -1, code_crc, &line_start);
       block_end = ::ftell(code);
     } else {
       // if this line has a tag, read all tag data
@@ -654,7 +654,7 @@ int Mergeback::merge_back(const char *s, const char *p, Task task) {
  \return 0 if MergeBack is not enabled, or the result of the merge_back function.
  \see Mergeback::merge_back(const char *s, const char *p, Task task)
  */
-int mergeback_code_files(fld::Project &proj, Mergeback::Feedback feedback)
+int mergeback_code_files(Project &proj, Mergeback::Feedback feedback)
 {
   static bool recursion_lock = false;
   if (recursion_lock) return 2;