- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index a4e02903c5b02db738fb7036efd1eca04ed58911..50a0a9b00f31a31a21cdb83af792796c288cad10 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -41,7 +41,7 @@
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 
@@ -105,7 +105,9 @@ MenuItem::MenuItem(Kind kind, string const & label,
 MenuItem::MenuItem(Kind kind, string const & label,
                   FuncRequest const & func, bool optional)
        : kind_(kind), label_(label), func_(func), optional_(optional)
-{}
+{
+       func_.origin = FuncRequest::UI;
+}
 
 
 MenuItem::~MenuItem()
@@ -399,7 +401,7 @@ void Menu::checkShortcuts() const
 
 void MenuBackend::specialMenu(string const &name)
 {
-       if (hasMenu(name)) 
+       if (hasMenu(name))
                specialmenu_ = &getMenu(name);
 }
 
@@ -433,13 +435,14 @@ void expandLastfiles(Menu & tomenu, LyXView const * view)
        LastFiles::const_iterator end = lastfiles.end();
 
        for (; lfit != end && ii < 10; ++lfit, ++ii) {
-               string const label = tostr(ii) + ". "
+               string const label = convert<string>(ii) + ". "
                        + MakeDisplayPath((*lfit), 30)
-                       + '|' + tostr(ii);
+                       + '|' + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
        }
 }
 
+
 void expandDocuments(Menu & tomenu, LyXView const * view)
 {
        typedef vector<string> Strings;
@@ -457,7 +460,7 @@ void expandDocuments(Menu & tomenu, LyXView const * view)
        for (; docit != end; ++docit, ++ii) {
                string label = MakeDisplayPath(*docit, 20);
                if (ii < 10)
-                       label = tostr(ii) + ". " + label + '|' + tostr(ii);
+                       label = convert<string>(ii) + ". " + label + '|' + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
        }
 }
@@ -610,8 +613,8 @@ void expandToc2(Menu & tomenu,
                        label += limit_string_length(toc_list[i].str);
                        if (toc_list[i].depth == depth
                            && shortcut_count < 9) {
-                               if (label.find(tostr(shortcut_count + 1)) != string::npos)
-                                       label += '|' + tostr(++shortcut_count);
+                               if (label.find(convert<string>(shortcut_count + 1)) != string::npos)
+                                       label += '|' + convert<string>(++shortcut_count);
                        }
                        tomenu.add(MenuItem(MenuItem::Command, label,
                                            FuncRequest(toc_list[i].action())));
@@ -628,8 +631,8 @@ void expandToc2(Menu & tomenu,
                        label += limit_string_length(toc_list[pos].str);
                        if (toc_list[pos].depth == depth &&
                            shortcut_count < 9) {
-                               if (label.find(tostr(shortcut_count + 1)) != string::npos)
-                                       label += '|' + tostr(++shortcut_count);
+                               if (label.find(convert<string>(shortcut_count + 1)) != string::npos)
+                                       label += '|' + convert<string>(++shortcut_count);
                                }
                        if (new_pos == pos + 1) {
                                tomenu.add(MenuItem(MenuItem::Command,
@@ -713,7 +716,7 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view)
 
        for (unsigned int index = 0; cit != end; ++cit, ++index) {
                tomenu.add(MenuItem(MenuItem::Command, *cit,
-                                   FuncRequest(LFUN_PASTE, tostr(index))));
+                                   FuncRequest(LFUN_PASTE, convert<string>(index))));
        }
 }
 
@@ -731,7 +734,7 @@ void expandBranches(Menu & tomenu, LyXView const * view)
        for (int ii = 1; cit != end; ++cit, ++ii) {
                string label = cit->getBranch();
                if (ii < 10)
-                       label = tostr(ii) + ". " + label + "|" + tostr(ii);
+                       label = convert<string>(ii) + ". " + label + "|" + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label,
                                    FuncRequest(LFUN_INSERT_BRANCH,
                                                cit->getBranch())), view);
@@ -801,7 +804,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                        break;
 
                case MenuItem::Command:
-                       if (!specialmenu_ 
+                       if (!specialmenu_
                            || !specialmenu_->hasFunc(cit->func()))
                                tomenu.add(*cit, view);
                }