MSVC|Refactor: Workaround for compiler limitation

Even VS2015 doesn't know how to determine that a CallbackAction * cannot be used as std::function...
skyjake · Feb 27, 2016 · 85318a6 · 85318a6
1 parent 1c68ff5
commit 85318a6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp b/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
@@ -55,7 +55,7 @@ DENG_GUI_PIMPL(GamePanelButtonWidget)
         playButton->setImage(new StyleProceduralImage("play", self));
         playButton->setImageColor(style().colors().colorf("inverted.text"));
         playButton->setOverrideImageSize(style().fonts().font("default").height().value());
-        playButton->setAction([this] () { playButtonPressed(); });
+        playButton->setActionFn([this] () { playButtonPressed(); });
         self.addButton(playButton);
 
         // List of saved games.
@@ -71,7 +71,7 @@ DENG_GUI_PIMPL(GamePanelButtonWidget)
         deleteSaveButton->setSizePolicy(ui::Expand, ui::Expand);
         deleteSaveButton->set(Background());
         deleteSaveButton->hide();
-        deleteSaveButton->setAction([this] () { deleteButtonPressed(); });
+        deleteSaveButton->setActionFn([this] () { deleteButtonPressed(); });
         self.panel().add(deleteSaveButton);
 
         self.panel().setContent(saves);

diff --git a/doomsday/apps/client/src/ui/home/multiplayerpanelbuttonwidget.cpp b/doomsday/apps/client/src/ui/home/multiplayerpanelbuttonwidget.cpp
@@ -50,7 +50,7 @@ DENG_GUI_PIMPL(MultiplayerPanelButtonWidget)
         joinButton->setText(tr("Join"));
         joinButton->useInfoStyle();
         joinButton->setSizePolicy(ui::Expand, ui::Expand);
-        joinButton->setAction([this] () { joinButtonPressed(); });
+        joinButton->setActionFn([this] () { joinButtonPressed(); });
         self.addButton(joinButton);
 
         info = new LabelWidget;

diff --git a/doomsday/apps/client/src/ui/home/packageswidget.cpp b/doomsday/apps/client/src/ui/home/packageswidget.cpp
@@ -89,7 +89,7 @@ DENG_GUI_PIMPL(PackagesWidget)
             _loadButton = new ButtonWidget;
             //_loadButton->setFont("small");
             //_loadButton->margins().setTopBottom("unit");
-            _loadButton->setAction([this] ()
+            _loadButton->setActionFn([this] ()
             {
                 auto &loader = App::packageLoader();
                 if(loader.isLoaded(packageId()))
@@ -177,7 +177,7 @@ DENG_GUI_PIMPL(PackagesWidget)
             {
                 auto *btn = new ButtonWidget;
                 btn->setText(_E(l) + tag.toLower());
-                btn->setAction([this, tag] ()
+                btn->setActionFn([this, tag] ()
                 {
                     String terms = _owner.d->search->text();
                     if(!terms.isEmpty() && !terms.last().isSpace()) terms += " ";
@@ -305,7 +305,7 @@ DENG_GUI_PIMPL(PackagesWidget)
         clearSearch->rule()
                 .setInput(Rule::Right, search->rule().left())
                 .setMidAnchorY(search->rule().midY());
-        clearSearch->setAction([this] () {
+        clearSearch->setActionFn([this] () {
             search->setText("");
             root().setFocus(search);
         });

diff --git a/doomsday/apps/client/src/ui/home/savelistwidget.cpp b/doomsday/apps/client/src/ui/home/savelistwidget.cpp
@@ -73,7 +73,7 @@ DENG_GUI_PIMPL(SaveListWidget)
         button.margins().set("dialog.gap");
         button.set(Background(Vector4f()));
 
-        button.setAction([this, &button] () {
+        button.setActionFn([this, &button] () {
             toggleSelectedItem(button);
             emit owner.mouseActivity();
         });

diff --git a/doomsday/sdk/libappfw/include/de/widgets/buttonwidget.h b/doomsday/sdk/libappfw/include/de/widgets/buttonwidget.h
@@ -101,8 +101,11 @@ class LIBAPPFW_PUBLIC ButtonWidget : public LabelWidget
      * when the button is pressed.
      *
      * @param callback  Callback function.
+     *
+     * @todo Rename back to setAction() when MSVC can understand that Action *
+     * cannot be used to initialize a std::function<void ()>.
      */
-    void setAction(std::function<void ()> callback);
+    void setActionFn(std::function<void ()> callback);
 
     Action const *action() const;
 

diff --git a/doomsday/sdk/libappfw/src/widgets/buttonwidget.cpp b/doomsday/sdk/libappfw/src/widgets/buttonwidget.cpp
@@ -265,7 +265,7 @@ void ButtonWidget::setAction(RefArg<Action> action)
     }
 }
 
-void ButtonWidget::setAction(std::function<void ()> callback)
+void ButtonWidget::setActionFn(std::function<void ()> callback)
 {
     setAction(new CallbackAction(callback));
 }