Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 2c90b17f9334b522b9c81c1661157d7c7559cddf..9f99c0b737fb25913d1158f2c32cc978bf438dfa 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -64,7 +64,7 @@
 #include <QToolButton>
 #include <QVariant>
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 #include <map>
 #include <vector>
@@ -108,6 +108,8 @@ private:
 };
 
 
+// this must be sorted alphabetically
+// Upper case comes before lower case
 PngMap sorted_png_map[] = {
        { "Bumpeq", "bumpeq2" },
        { "Cap", "cap2" },
@@ -134,6 +136,7 @@ PngMap sorted_png_map[] = {
        { "Updownarrow", "updownarrow2" },
        { "Upsilon", "upsilon2" },
        { "Vdash", "vdash3" },
+       { "Vert", "vert2" },
        { "Xi", "xi2" },
        { "nLeftarrow", "nleftarrow2" },
        { "nLeftrightarrow", "nleftrightarrow2" },
@@ -152,7 +155,7 @@ QString findPng(QString const & name)
 {
        PngMap const * const begin = sorted_png_map;
        PngMap const * const end = begin + nr_sorted_png_map;
-       BOOST_ASSERT(sorted(begin, end));
+       LASSERT(sorted(begin, end), /**/);
 
        PngMap const * const it = find_if(begin, end, CompareKey(name));
 
@@ -431,7 +434,7 @@ private:
                p->filter();
                for (int i = 0; i < f.length(); ++i) {
                        int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive);
-                       BOOST_ASSERT(p != -1);
+                       LASSERT(p != -1, /**/);
                        if (lastp == p - 1 && lastp != -1) {
                                // remove ")" and append "x)"
                                r = r.left(r.length() - 4) + s[p] + "</u>";
@@ -526,7 +529,7 @@ void GuiLayoutBox::setFilter(QString const & s)
                // We do not call our implementation of showPopup because that
                // would reset the filter again. This is only needed if the user clicks
                // on the QComboBox.
-               BOOST_ASSERT(!inShowPopup_);
+               LASSERT(!inShowPopup_, /**/);
                inShowPopup_ = true;
                QComboBox::showPopup();
                inShowPopup_ = false;
@@ -596,7 +599,7 @@ void GuiLayoutBox::showPopup()
 
        // call QComboBox::showPopup. But set the inShowPopup_ flag to switch on
        // the hack in the item delegate to make space for the headers.
-       BOOST_ASSERT(!inShowPopup_);
+       LASSERT(!inShowPopup_, /**/);
        inShowPopup_ = true;
        QComboBox::showPopup();
        inShowPopup_ = false;