more latin1..utf8 schanges. all of src/* should be utf8 now

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

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 632f7b49793df7f84e2d270e60a5a14374aa52cd..6ff3e9636596977e683264dbda48d617ac5b8085 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
@@ -365,8 +365,9 @@ void GuiLayoutBox::setFilter(QString const & s)
                filterModel_->triggerLayoutChange();
                
                if (!s.isEmpty())
-                       owner_.message(_("Filtering layouts with \"" + fromqstr(s) + "\". "
-                                        "Press ESC to remove filter."));
+                       owner_.message(bformat(_("Filtering layouts with \"%1$s\". "
+                                                "Press ESC to remove filter."),
+                                              qstring_to_ucs4(s)));
                else
                        owner_.message(_("Enter characters to filter the layout list."));
        }
@@ -602,7 +603,7 @@ void GuiLayoutBox::updateContents(bool reset)
        // or we've moved from one inset to another
        DocumentClass const * text_class = &buffer->params().documentClass();
        Inset const * inset = 
-               owner_.view()->cursor().innerParagraph().inInset();
+               &(owner_.view()->cursor().innerParagraph().inInset());
        if (!reset && text_class_ == text_class && inset_ == inset) {
                set(owner_.view()->cursor().innerParagraph().layout().name());
                return;
@@ -917,7 +918,7 @@ void GuiToolbar::update(bool in_math, bool in_table, bool in_review,
 
 QString GuiToolbar::sessionKey() const
 {
-       return "view-" + QString::number(owner_.id()) + "/" + objectName();
+       return "views/" + QString::number(owner_.id()) + "/" + objectName();
 }
 
 
@@ -970,4 +971,4 @@ void GuiToolbar::toggle()
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiToolbar_moc.cpp"
+#include "moc_GuiToolbar.cpp"