M src/ConfigMenu.hh → src/ConfigMenu.hh

@@ -24,7 +24,7 @@ // DEALINGS IN THE SOFTWARE.
 
 
 class BScreen;
-class ScreenResource;
+struct ScreenResource;
 
 namespace FbTk{
     class Menu;
@@ -36,6 +36,8 @@ public:
 
     // makes the setup() function-signature shorter
     struct SetupHelper {
+        SetupHelper(BScreen& _s, FbTk::ResourceManager& _rm, ScreenResource& _r) :
+            screen(_s), rm(_rm), resource(_r) { }
         BScreen& screen;
         FbTk::ResourceManager& rm;
         ScreenResource& resource;

M src/Screen.cc → src/Screen.cc

@@ -1408,11 +1408,7 @@ }
 
 void BScreen::setupConfigmenu(FbTk::Menu &menu) {
 
-    struct ConfigMenu::SetupHelper sh;
-    sh.screen = *this;
-    sh.rm = m_resource_manager;
-    sh.resource = resource;
-
+    struct ConfigMenu::SetupHelper sh(*this, m_resource_manager, resource);
     menu.removeAll();
     ConfigMenu::setup(menu, sh);
     menu.updateMenu();