Move declarations of Resource enums to a separate file

The reason for this is that I need to access those enums from fluxbox-update_configs and I don't
want to #include and link everything in src.
I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.

1 files changed, 3 insertions, 24 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 317b73a..27d8ce9 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -511,12 +511,12 @@ void FocusControl::revertFocus(BScreen &screen) {
             FbTk::Menu::shownMenu()->grabInputFocus();
         else {
             switch (screen.focusControl().focusModel()) {
-            case FocusControl::MOUSEFOCUS:
-            case FocusControl::STRICTMOUSEFOCUS:
+            case MOUSEFOCUS:
+            case STRICTMOUSEFOCUS:
                 XSetInputFocus(screen.rootWindow().display(),
                                PointerRoot, None, CurrentTime);
                 break;
-            case FocusControl::CLICKFOCUS:
+            case CLICKFOCUS:
                 screen.rootWindow().setInputFocus(RevertToPointerRoot,
                                                   CurrentTime);
                 break;
@@ -608,24 +608,3 @@ void FocusControl::setFocusedWindow(WinClient *client) {
     if (old_screen && screen != old_screen)
         old_screen->focusedWindowSig().emit(*old_screen, s_focused_fbwindow, s_focused_window);
 }
-
-////////////////////// FocusControl RESOURCES
-namespace FbTk {
-
-template<>
-const EnumTraits<FocusControl::FocusModel>::Pair EnumTraits<FocusControl::FocusModel>::s_map[] = {
-    { "MouseFocus",       FocusControl::MOUSEFOCUS },
-    { "StrictMouseFocus", FocusControl::STRICTMOUSEFOCUS },
-    { "ClickFocus",       FocusControl::CLICKFOCUS },
-    { NULL,               FocusControl::CLICKFOCUS }
-};
-
-template<>
-const EnumTraits<FocusControl::TabFocusModel>::Pair EnumTraits<FocusControl::TabFocusModel>::s_map[] = {
-    { "SloppyTabFocus",   FocusControl::MOUSETABFOCUS },
-    { "ClickToTabFocus",  FocusControl::CLICKTABFOCUS },
-    { NULL,               FocusControl::CLICKTABFOCUS }
-};
-
-} // end namespace FbTk
-