QDialogButtonBox for the remaining dialogs.

[lyx.git] / src / frontends / qt4 / Menus.cpp

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 6dd99adb9ae49baaf299414c610ade906618e7d7..c68ecbe5a5575f174ce1938d4539602232083b00 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -897,13 +897,13 @@ void MenuDefinition::expandLanguageSelector(Buffer const * buf)
        if (languages_buffer.size() < 2)
                return;
 
-       std::set<Language const *, sortLanguageByName> languages;
+       std::set<Language const *, sortLanguageByName> langs;
 
        std::set<Language const *>::const_iterator const beg =
                languages_buffer.begin();
        for (std::set<Language const *>::const_iterator cit = beg;
             cit != languages_buffer.end(); ++cit) {
-               languages.insert(*cit);
+               langs.insert(*cit);
        }
 
        MenuItem item(MenuItem::Submenu, qt_("Language|L"));
@@ -912,9 +912,9 @@ void MenuDefinition::expandLanguageSelector(Buffer const * buf)
        QStringList accelerators;
        if (morelangs.contains('|'))
                accelerators.append(morelangs.section('|', -1));
-       std::set<Language const *, sortLanguageByName>::const_iterator const begin = languages.begin();
+       std::set<Language const *, sortLanguageByName>::const_iterator const begin = langs.begin();
        for (std::set<Language const *, sortLanguageByName>::const_iterator cit = begin;
-            cit != languages.end(); ++cit) {
+                        cit != langs.end(); ++cit) {
                QString label = qt_((*cit)->display());
                // try to add an accelerator
                bool success = false;
@@ -1608,12 +1608,12 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
 
        for (int ii = 1; cit != end; ++cit, ++ii) {
                docstring label = cit->second;
-               CitationStyle cs = citeStyleList[ii - 1];
-               cs.forceUpperCase &= force;
-               cs.hasStarredVersion &= star;
+               CitationStyle ccs = citeStyleList[ii - 1];
+               ccs.forceUpperCase &= force;
+               ccs.hasStarredVersion &= star;
                addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label),
                                    FuncRequest(LFUN_INSET_MODIFY,
-                                               "changetype " + from_utf8(citationStyleToString(cs)))));
+                                               "changetype " + from_utf8(citationStyleToString(ccs)))));
        }
 
        if (cs.hasStarredVersion) {
@@ -1629,10 +1629,10 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
                        if (amps > 0) {
                                if (amps > 1)
                                        starred = subst(starred, from_ascii("&&"), from_ascii("<:amp:>"));
-                               size_t n = starred.find('&');
+                               size_t nn = starred.find('&');
                                char_type accel = char_type();
-                               if (n != docstring::npos && n < starred.size() - 1)
-                                       accel = starred[n + 1];
+                               if (nn != docstring::npos && nn < starred.size() - 1)
+                                       accel = starred[nn + 1];
                                starred = subst(starred, from_ascii("&"), from_ascii(""));
                                if (amps > 1)
                                        starred = subst(starred, from_ascii("<:amp:>"), from_ascii("&&"));
@@ -1917,9 +1917,10 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv,
                                translateIfPossible(prevlayout));
                // We use command-alternatives here since this is how the binding is defined
                // (otherwise, the binding is not displayed in the menu)
-               add(MenuItem(MenuItem::Command, toqstr(label),
-                            FuncRequest(LFUN_COMMAND_ALTERNATIVES,
-                                        from_ascii("environment-split ; environment-split previous"))));
+               if (getStatus(FuncRequest(LFUN_ENVIRONMENT_SPLIT)).enabled())
+                       add(MenuItem(MenuItem::Command, toqstr(label),
+                                    FuncRequest(LFUN_COMMAND_ALTERNATIVES,
+                                                from_ascii("environment-split ; environment-split previous"))));
        }
        if (!outerlayout.empty()) {
                docstring label;
@@ -2545,19 +2546,19 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
                        continue;
                }
 
-               Menu * menu = new Menu(view, m->submenuname(), true);
-               menu->setTitle(label(*m));
+               Menu * menuptr = new Menu(view, m->submenuname(), true);
+               menuptr->setTitle(label(*m));
 
 #if defined(Q_OS_MAC) && (defined(QT_MAC_USE_COCOA) || (QT_VERSION >= 0x050000))
                // On Mac OS with QT/cocoa, the menu is not displayed if there is no action
                // so we create a temporary one here
-               QAction * action = new QAction(menu);
-               menu->addAction(action);
+               QAction * action = new QAction(menuptr);
+               menuptr->addAction(action);
 #endif
 
-               qmb->addMenu(menu);
+               qmb->addMenu(menuptr);
 
-               d->name_map_[view][name] = menu;
+               d->name_map_[view][name] = menuptr;
        }
 }