some minor lyxaction cleanup

[features.git] / src / frontends / qt2 / Toolbar_pimpl.C

diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C
index deee5abc6c7027c8e32ad678b723fdaa99c4e706..ff340b90f2d83eb85ef0023e7a5fc385542256b4 100644 (file)
--- a/src/frontends/qt2/Toolbar_pimpl.C
+++ b/src/frontends/qt2/Toolbar_pimpl.C
@@ -36,17 +36,17 @@
  
 using std::endl;
 
-extern LyXAction lyxaction;
-
 namespace {
  
 QPixmap getIconPixmap(int action)
 {
+       kb_action act;
        string arg;
+       boost::tie(act, arg) = lyxaction.retrieveActionArg(action);
+ 
+       string const name = lyxaction.getActionName(act);
        string xpm_name;
 
-       const kb_action act = lyxaction.retrieveActionArg(action, arg);
-       string const name = lyxaction.getActionName(act);
        if (!arg.empty())
                xpm_name = subst(name + ' ' + arg, ' ','_');
        else