wip

1 files changed, 17 insertions, 6 deletions

diff --git a/fluid/proj/mergeback.h b/fluid/proj/mergeback.h
index a515b1815..48cc4e400 100644
--- a/fluid/proj/mergeback.h
+++ b/fluid/proj/mergeback.h
@@ -33,15 +33,26 @@ namespace proj {
 /** Class that implements the MergeBack functionality.
  \see merge_back(const std::string &s, int task)
  */
+enum {
+  FLD_MERGEBACK_TAG_GENERIC = 0,
+  FLD_MERGEBACK_TAG_CODE,
+  FLD_MERGEBACK_TAG_MENU_CALLBACK,
+  FLD_MERGEBACK_TAG_WIDGET_CALLBACK,
+  FLD_MERGEBACK_TAG_UNUSED_
+};
+
+enum {
+  FLD_MERGEBACK_TASK_ANALYSE = 0,
+  FLD_MERGEBACK_TASK_INTERACTIVE,
+  FLD_MERGEBACK_TASK_APPLY,
+  FLD_MERGEBACK_TASK_APPLY_IF_SAFE = 3
+};
+
 class Mergeback
 {
 public:
-  enum class Tag {
-    GENERIC = 0, CODE, MENU_CALLBACK, WIDGET_CALLBACK, UNUSED_
-  };
-  enum class Task {
-    ANALYSE = 0, INTERACTIVE, APPLY, APPLY_IF_SAFE = 3
-  };
+  typedef int Tag;
+  typedef int Task;
   enum Feedback { QUIET = 0, CHATTY = 1 };
 protected:
   /// Apply mergeback for this project.