From c594a2f9d841ca643988b58bf38d205922d5fb4e Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Mon, 9 Oct 2006 12:46:08 +0000
Subject: [PATCH] incomplete qt3 and gtk support for Revision 15283

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15286 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/gtk/GAboutlyx.C      | 2 +-
 src/frontends/gtk/GBibItem.C       | 3 +--
 src/frontends/gtk/GBibtex.C        | 3 +--
 src/frontends/gtk/GBox.C           | 3 +--
 src/frontends/gtk/GBranch.C        | 3 +--
 src/frontends/gtk/GChanges.C       | 3 +--
 src/frontends/gtk/GCharacter.C     | 3 +--
 src/frontends/gtk/GCitation.C      | 3 +--
 src/frontends/gtk/GDocument.C      | 3 +--
 src/frontends/gtk/GERT.C           | 2 +-
 src/frontends/gtk/GErrorList.C     | 4 ++--
 src/frontends/gtk/GExternal.C      | 2 +-
 src/frontends/gtk/GFloat.C         | 2 +-
 src/frontends/gtk/GGraphics.C      | 2 +-
 src/frontends/gtk/GInclude.C       | 2 +-
 src/frontends/gtk/GLog.C           | 4 ++--
 src/frontends/gtk/GMathDelim.C     | 2 +-
 src/frontends/gtk/GMathPanel.C     | 2 +-
 src/frontends/gtk/GMathsMatrix.C   | 2 +-
 src/frontends/gtk/GNote.C          | 2 +-
 src/frontends/gtk/GParagraph.C     | 2 +-
 src/frontends/gtk/GPreferences.C   | 2 +-
 src/frontends/gtk/GRef.C           | 2 +-
 src/frontends/gtk/GSearch.C        | 2 +-
 src/frontends/gtk/GSendto.C        | 2 +-
 src/frontends/gtk/GShowFile.C      | 4 ++--
 src/frontends/gtk/GSpellchecker.C  | 2 +-
 src/frontends/gtk/GTableCreate.C   | 2 +-
 src/frontends/gtk/GTabular.C       | 2 +-
 src/frontends/gtk/GTexinfo.C       | 2 +-
 src/frontends/gtk/GThesaurus.C     | 2 +-
 src/frontends/gtk/GToc.C           | 2 +-
 src/frontends/gtk/GUrl.C           | 2 +-
 src/frontends/gtk/GVSpace.C        | 2 +-
 src/frontends/gtk/GViewBase.C      | 6 ++++--
 src/frontends/gtk/GViewBase.h      | 6 +++---
 src/frontends/gtk/GWrap.C          | 2 +-
 src/frontends/qt3/QAbout.C         | 2 +-
 src/frontends/qt3/QBibitem.C       | 2 +-
 src/frontends/qt3/QBibtex.C        | 2 +-
 src/frontends/qt3/QBox.C           | 2 +-
 src/frontends/qt3/QBranch.C        | 2 +-
 src/frontends/qt3/QChanges.C       | 2 +-
 src/frontends/qt3/QCharacter.C     | 2 +-
 src/frontends/qt3/QCitation.C      | 2 +-
 src/frontends/qt3/QDocument.C      | 2 +-
 src/frontends/qt3/QERT.C           | 2 +-
 src/frontends/qt3/QErrorList.C     | 4 ++--
 src/frontends/qt3/QExternal.C      | 2 +-
 src/frontends/qt3/QFloat.C         | 2 +-
 src/frontends/qt3/QGraphics.C      | 2 +-
 src/frontends/qt3/QInclude.C       | 2 +-
 src/frontends/qt3/QIndex.C         | 2 +-
 src/frontends/qt3/QLog.C           | 2 +-
 src/frontends/qt3/QMath.C          | 6 +++---
 src/frontends/qt3/QNote.C          | 2 +-
 src/frontends/qt3/QParagraph.C     | 2 +-
 src/frontends/qt3/QPrefs.C         | 2 +-
 src/frontends/qt3/QPrint.C         | 2 +-
 src/frontends/qt3/QRef.C           | 2 +-
 src/frontends/qt3/QSearch.C        | 2 +-
 src/frontends/qt3/QSendto.C        | 2 +-
 src/frontends/qt3/QShowFile.C      | 2 +-
 src/frontends/qt3/QSpellchecker.C  | 2 +-
 src/frontends/qt3/QTabular.C       | 2 +-
 src/frontends/qt3/QTabularCreate.C | 2 +-
 src/frontends/qt3/QTexinfo.C       | 2 +-
 src/frontends/qt3/QThesaurus.C     | 2 +-
 src/frontends/qt3/QToc.C           | 4 ++--
 src/frontends/qt3/QURL.C           | 2 +-
 src/frontends/qt3/QVSpace.C        | 2 +-
 src/frontends/qt3/QViewSource.C    | 2 +-
 src/frontends/qt3/QWrap.C          | 2 +-
 73 files changed, 85 insertions(+), 91 deletions(-)

diff --git a/src/frontends/gtk/GAboutlyx.C b/src/frontends/gtk/GAboutlyx.C
index f942a1f51a..bfa9350471 100644
--- a/src/frontends/gtk/GAboutlyx.C
+++ b/src/frontends/gtk/GAboutlyx.C
@@ -152,7 +152,7 @@ Glib::ustring translateMarkup(Glib::ustring const & lyxMarkup)
 
 
 GAboutlyx::GAboutlyx(Dialog & parent)
-	: GViewCB<ControlAboutlyx, GViewGladeB>(parent, "About LyX")
+	: GViewCB<ControlAboutlyx, GViewGladeB>(parent, _("About LyX"))
 {
 }
 
diff --git a/src/frontends/gtk/GBibItem.C b/src/frontends/gtk/GBibItem.C
index 2ac096ee63..5b589c44a6 100644
--- a/src/frontends/gtk/GBibItem.C
+++ b/src/frontends/gtk/GBibItem.C
@@ -29,9 +29,8 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-// FIXME UNICODE
 GBibItem::GBibItem(Dialog & parent)
-	: GViewCB<ControlCommand, GViewGladeB>(parent, lyx::to_utf8(_("Bibliography Entry Settings")), false)
+	: GViewCB<ControlCommand, GViewGladeB>(parent, _("Bibliography Entry Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GBibtex.C b/src/frontends/gtk/GBibtex.C
index 72cc9b9de2..d1a3398651 100644
--- a/src/frontends/gtk/GBibtex.C
+++ b/src/frontends/gtk/GBibtex.C
@@ -37,9 +37,8 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-// FIXME UNICODE
 GBibtex::GBibtex(Dialog & parent)
-	: GViewCB<ControlBibtex, GViewGladeB>(parent, lyx::to_utf8(_("BibTeX Bibliography")), false)
+	: GViewCB<ControlBibtex, GViewGladeB>(parent, _("BibTeX Bibliography"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GBox.C b/src/frontends/gtk/GBox.C
index b485b4127b..02ec049148 100644
--- a/src/frontends/gtk/GBox.C
+++ b/src/frontends/gtk/GBox.C
@@ -38,9 +38,8 @@ namespace {
 string defaultUnit("cm");
 } // namespace anon
 
-// FIXME UNICODE
 GBox::GBox(Dialog & parent)
-	: GViewCB<ControlBox, GViewGladeB>(parent, lyx::to_utf8(_("Box Settings")), false)
+	: GViewCB<ControlBox, GViewGladeB>(parent, _("Box Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GBranch.C b/src/frontends/gtk/GBranch.C
index aeec17b9d5..055f7fedd3 100644
--- a/src/frontends/gtk/GBranch.C
+++ b/src/frontends/gtk/GBranch.C
@@ -33,9 +33,8 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-// FIXME UNICODE
 GBranch::GBranch(Dialog & parent)
-	: GViewCB<ControlBranch, GViewGladeB>(parent, lyx::to_utf8(_("Branch Settings")), false)
+	: GViewCB<ControlBranch, GViewGladeB>(parent, _("Branch Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GChanges.C b/src/frontends/gtk/GChanges.C
index 3644fbbade..d7df9566ca 100644
--- a/src/frontends/gtk/GChanges.C
+++ b/src/frontends/gtk/GChanges.C
@@ -28,9 +28,8 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-// FIXME UNICODE
 GChanges::GChanges(Dialog & parent)
-	: GViewCB<ControlChanges, GViewGladeB>(parent, lyx::to_utf8(_("Merge Changes")), false)
+	: GViewCB<ControlChanges, GViewGladeB>(parent, _("Merge Changes"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GCharacter.C b/src/frontends/gtk/GCharacter.C
index bb88a695cc..150fbf888e 100644
--- a/src/frontends/gtk/GCharacter.C
+++ b/src/frontends/gtk/GCharacter.C
@@ -35,9 +35,8 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-// FIXME UNICODE
 GCharacter::GCharacter(Dialog & parent)
-	: GViewCB<ControlCharacter, GViewGladeB>(parent, lyx::to_utf8(_("Text Style")), false)
+	: GViewCB<ControlCharacter, GViewGladeB>(parent, _("Text Style"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GCitation.C b/src/frontends/gtk/GCitation.C
index a9f50033be..917ea303f7 100644
--- a/src/frontends/gtk/GCitation.C
+++ b/src/frontends/gtk/GCitation.C
@@ -67,9 +67,8 @@ bool GCitation::bib_visible(const Gtk::TreeModel::const_iterator& iter)
 styleModelColumns styleColumns;
 
 
-// FIXME UNICODE
 GCitation::GCitation(Dialog & parent)
-	: GViewCB<ControlCitation, GViewGladeB>(parent, lyx::to_utf8(_("Citation")), false)
+	: GViewCB<ControlCitation, GViewGladeB>(parent, _("Citation"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GDocument.C b/src/frontends/gtk/GDocument.C
index 3c586b6e03..978e7841ce 100644
--- a/src/frontends/gtk/GDocument.C
+++ b/src/frontends/gtk/GDocument.C
@@ -55,9 +55,8 @@ char const * const encodings[] = { "Language Default", "LaTeX default",
 }
 
 
-// FIXME UNICODE
 GDocument::GDocument(Dialog & parent)
-	: GViewCB<ControlDocument, GViewGladeB>(parent, lyx::to_utf8(_("Document Settings")), false),
+	: GViewCB<ControlDocument, GViewGladeB>(parent, _("Document Settings"), false),
 	lang_(getSecond(getLanguageData(false)))
 {}
 
diff --git a/src/frontends/gtk/GERT.C b/src/frontends/gtk/GERT.C
index 438217e743..ef0b5c4023 100644
--- a/src/frontends/gtk/GERT.C
+++ b/src/frontends/gtk/GERT.C
@@ -30,7 +30,7 @@ namespace lyx {
 namespace frontend {
 
 GERT::GERT(Dialog & parent)
-	: GViewCB<ControlERT, GViewGladeB>(parent, lyx::to_utf8(_("TeX Settings")), false)
+	: GViewCB<ControlERT, GViewGladeB>(parent, _("TeX Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GErrorList.C b/src/frontends/gtk/GErrorList.C
index 773beac868..d9dbbb85df 100644
--- a/src/frontends/gtk/GErrorList.C
+++ b/src/frontends/gtk/GErrorList.C
@@ -29,7 +29,7 @@ namespace lyx {
 namespace frontend {
 
 GErrorList::GErrorList(Dialog & parent)
-	: GViewCB<ControlErrorList, GViewGladeB>(parent, lyx::to_utf8(_("Errors")), false)
+	: GViewCB<ControlErrorList, GViewGladeB>(parent, _("Errors"), false)
 {}
 
 
@@ -59,7 +59,7 @@ void GErrorList::doBuild()
 
 void GErrorList::update()
 {
-	setTitle(controller().name());
+	setTitle(lyx::from_ascii(controller().name()));
 	updateContents();
 }
 
diff --git a/src/frontends/gtk/GExternal.C b/src/frontends/gtk/GExternal.C
index 70c967cc78..33fcef1bfe 100644
--- a/src/frontends/gtk/GExternal.C
+++ b/src/frontends/gtk/GExternal.C
@@ -297,7 +297,7 @@ void get_extra(external::ExtraData & data,
 
 
 GExternal::GExternal(Dialog & parent)
-	: GViewCB<ControlExternal, GViewGladeB>(parent, lyx::to_utf8(_("External Settings")), false)
+	: GViewCB<ControlExternal, GViewGladeB>(parent, _("External Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GFloat.C b/src/frontends/gtk/GFloat.C
index 277a0afc1b..816b86afe1 100644
--- a/src/frontends/gtk/GFloat.C
+++ b/src/frontends/gtk/GFloat.C
@@ -38,7 +38,7 @@ using support::contains;
 namespace frontend {
 
 GFloat::GFloat(Dialog & parent)
-	: GViewCB<ControlFloat, GViewGladeB>(parent, lyx::to_utf8(_("Float Settings")), false)
+	: GViewCB<ControlFloat, GViewGladeB>(parent, _("Float Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GGraphics.C b/src/frontends/gtk/GGraphics.C
index 353df6fdbd..5215665ee0 100644
--- a/src/frontends/gtk/GGraphics.C
+++ b/src/frontends/gtk/GGraphics.C
@@ -50,7 +50,7 @@ string defaultUnit("cm");
 } // namespace anon
 
 GGraphics::GGraphics(Dialog & parent)
-	: GViewCB<ControlGraphics, GViewGladeB>(parent, lyx::to_utf8(_("Graphics")), false)
+	: GViewCB<ControlGraphics, GViewGladeB>(parent, _("Graphics"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GInclude.C b/src/frontends/gtk/GInclude.C
index e2616685c8..6420c4c3c3 100644
--- a/src/frontends/gtk/GInclude.C
+++ b/src/frontends/gtk/GInclude.C
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 GInclude::GInclude(Dialog & parent)
-	: GViewCB<ControlInclude, GViewGladeB>(parent, lyx::to_utf8(_("Child Document")), false)
+	: GViewCB<ControlInclude, GViewGladeB>(parent, _("Child Document"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GLog.C b/src/frontends/gtk/GLog.C
index 57b8f7312c..45be70de99 100644
--- a/src/frontends/gtk/GLog.C
+++ b/src/frontends/gtk/GLog.C
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 GLog::GLog(Dialog & parent)
-	: GViewCB<ControlLog, GViewGladeB>(parent, lyx::to_utf8(_("Log Viewer")), false)
+	: GViewCB<ControlLog, GViewGladeB>(parent, _("Log Viewer"), false)
 {}
 
 
@@ -56,7 +56,7 @@ void GLog::doBuild()
 
 void GLog::update()
 {
-	string const title = controller().title();
+	lyx::docstring const title = controller().title();
 
 	if (!title.empty())
 		setTitle(title);
diff --git a/src/frontends/gtk/GMathDelim.C b/src/frontends/gtk/GMathDelim.C
index c113c544a6..d94e4acf5a 100644
--- a/src/frontends/gtk/GMathDelim.C
+++ b/src/frontends/gtk/GMathDelim.C
@@ -104,7 +104,7 @@ inline int indexToCol(int index)
 
 
 GMathDelim::GMathDelim(Dialog & parent) :
-	GViewCB<ControlMath, GViewGladeB>(parent, lyx::to_utf8(_("Math Delimiters"))),
+	GViewCB<ControlMath, GViewGladeB>(parent, _("Math Delimiters")),
 	delimTbl_(delimTblRows, delimTblCols, xbm)
 {
 }
diff --git a/src/frontends/gtk/GMathPanel.C b/src/frontends/gtk/GMathPanel.C
index 57226e681f..2181511218 100644
--- a/src/frontends/gtk/GMathPanel.C
+++ b/src/frontends/gtk/GMathPanel.C
@@ -104,7 +104,7 @@ GXpmBtnTbl::XpmData xpmDown[] =
 
 
 GMathPanel::GMathPanel(Dialog & parent)
-	: GViewCB<ControlMath, GViewGladeB>(parent, lyx::to_utf8(_("Math Panel"))),
+	: GViewCB<ControlMath, GViewGladeB>(parent, _("Math Panel")),
 	  tableUp_(2, 5, xpmUp), tableDown_(4, 3, xpmDown)
 {
 }
diff --git a/src/frontends/gtk/GMathsMatrix.C b/src/frontends/gtk/GMathsMatrix.C
index 00e7288063..3cfd4649c1 100644
--- a/src/frontends/gtk/GMathsMatrix.C
+++ b/src/frontends/gtk/GMathsMatrix.C
@@ -35,7 +35,7 @@ namespace frontend {
 
 
 GMathsMatrix::GMathsMatrix(Dialog & parent)
-	: GViewCB<ControlMath, GViewGladeB>(parent, lyx::to_utf8(_("Math Matrix")), false)
+	: GViewCB<ControlMath, GViewGladeB>(parent, _("Math Matrix"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GNote.C b/src/frontends/gtk/GNote.C
index eb8735e9f3..65a622154c 100644
--- a/src/frontends/gtk/GNote.C
+++ b/src/frontends/gtk/GNote.C
@@ -32,7 +32,7 @@ namespace lyx {
 namespace frontend {
 
 GNote::GNote(Dialog & parent)
-	: GViewCB<ControlNote, GViewGladeB>(parent, lyx::to_utf8(_("Note Settings")), false)
+	: GViewCB<ControlNote, GViewGladeB>(parent, _("Note Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GParagraph.C b/src/frontends/gtk/GParagraph.C
index 7d8aa727fe..e731937439 100644
--- a/src/frontends/gtk/GParagraph.C
+++ b/src/frontends/gtk/GParagraph.C
@@ -41,7 +41,7 @@ namespace {
 
 
 GParagraph::GParagraph(Dialog & parent)
-	: GViewCB<ControlParagraph, GViewGladeB>(parent, lyx::to_utf8(_("Paragraph Settings")), false)
+	: GViewCB<ControlParagraph, GViewGladeB>(parent, _("Paragraph Settings"), false)
 {}
 
 void GParagraph::doBuild()
diff --git a/src/frontends/gtk/GPreferences.C b/src/frontends/gtk/GPreferences.C
index 091bae2d6c..75cd7adfb4 100644
--- a/src/frontends/gtk/GPreferences.C
+++ b/src/frontends/gtk/GPreferences.C
@@ -35,7 +35,7 @@ namespace lyx {
 namespace frontend {
 
 GPreferences::GPreferences(Dialog & parent)
-	: GViewCB<ControlPrefs, GViewGladeB>(parent, lyx::to_utf8(_("Preferences")), false)
+	: GViewCB<ControlPrefs, GViewGladeB>(parent, _("Preferences"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GRef.C b/src/frontends/gtk/GRef.C
index 5efd8a5e95..fc062423bc 100644
--- a/src/frontends/gtk/GRef.C
+++ b/src/frontends/gtk/GRef.C
@@ -62,7 +62,7 @@ bufferModelColumns bufferColumns;
 
 
 GRef::GRef(Dialog & parent)
-	: GViewCB<ControlRef, GViewGladeB>(parent, lyx::to_utf8(_("Cross-reference")), false)
+	: GViewCB<ControlRef, GViewGladeB>(parent, _("Cross-reference"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GSearch.C b/src/frontends/gtk/GSearch.C
index 54a77c4554..dd33cbaa81 100644
--- a/src/frontends/gtk/GSearch.C
+++ b/src/frontends/gtk/GSearch.C
@@ -33,7 +33,7 @@ typedef GViewCB<ControlSearch, GViewGladeB> base_class;
 
 
 GSearch::GSearch(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Find and Replace")), false)
+	: base_class(parent, _("Find and Replace"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GSendto.C b/src/frontends/gtk/GSendto.C
index 26aa55f159..4ff9179bae 100644
--- a/src/frontends/gtk/GSendto.C
+++ b/src/frontends/gtk/GSendto.C
@@ -33,7 +33,7 @@ namespace lyx {
 namespace frontend {
 
 GSendto::GSendto(Dialog & parent)
-	: GViewCB<ControlSendto, GViewGladeB>(parent, lyx::to_utf8(_("Send document to command")), false)
+	: GViewCB<ControlSendto, GViewGladeB>(parent, _("Send document to command"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GShowFile.C b/src/frontends/gtk/GShowFile.C
index 2a9594ca95..b23399a1ea 100644
--- a/src/frontends/gtk/GShowFile.C
+++ b/src/frontends/gtk/GShowFile.C
@@ -29,7 +29,7 @@ namespace lyx {
 namespace frontend {
 
 GShowFile::GShowFile(Dialog & parent)
-	: GViewCB<ControlShowFile, GViewGladeB>(parent, lyx::to_utf8(_("Show File")), false)
+	: GViewCB<ControlShowFile, GViewGladeB>(parent, _("Show File"), false)
 {}
 
 
@@ -53,7 +53,7 @@ void GShowFile::update()
 	string const title = controller().getFileName();
 
 	if (!title.empty())
-		setTitle(title);
+		setTitle(lyx::from_utf8(title));
 
 	string const contents = controller().getFileContents();
 
diff --git a/src/frontends/gtk/GSpellchecker.C b/src/frontends/gtk/GSpellchecker.C
index d67c6860eb..b25c289268 100644
--- a/src/frontends/gtk/GSpellchecker.C
+++ b/src/frontends/gtk/GSpellchecker.C
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 GSpellchecker::GSpellchecker(Dialog & parent)
-	: GViewCB<ControlSpellchecker, GViewGladeB>(parent, lyx::to_utf8(_("Spellchecker")), false)
+	: GViewCB<ControlSpellchecker, GViewGladeB>(parent, _("Spellchecker"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GTableCreate.C b/src/frontends/gtk/GTableCreate.C
index 5c208c548d..6f172ff2ca 100644
--- a/src/frontends/gtk/GTableCreate.C
+++ b/src/frontends/gtk/GTableCreate.C
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 GTableCreate::GTableCreate(Dialog & parent)
-	: GViewCB<ControlTabularCreate, GViewGladeB>(parent, lyx::to_utf8(_("Insert Table")))
+	: GViewCB<ControlTabularCreate, GViewGladeB>(parent, _("Insert Table"))
 {
 }
 
diff --git a/src/frontends/gtk/GTabular.C b/src/frontends/gtk/GTabular.C
index 103c02d603..da0665feac 100644
--- a/src/frontends/gtk/GTabular.C
+++ b/src/frontends/gtk/GTabular.C
@@ -39,7 +39,7 @@ namespace lyx {
 namespace frontend {
 
 GTabular::GTabular(Dialog & parent)
-	: GViewCB<ControlTabular, GViewGladeB>(parent, lyx::to_utf8(_("Table Settings")), false)
+	: GViewCB<ControlTabular, GViewGladeB>(parent, _("Table Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GTexinfo.C b/src/frontends/gtk/GTexinfo.C
index 81038c721a..41769fcaf0 100644
--- a/src/frontends/gtk/GTexinfo.C
+++ b/src/frontends/gtk/GTexinfo.C
@@ -34,7 +34,7 @@ namespace frontend {
 
 
 GTexinfo::GTexinfo(Dialog & parent)
-	: GViewCB<ControlTexinfo, GViewGladeB>(parent, lyx::to_utf8(_("TeX Information")), false),
+	: GViewCB<ControlTexinfo, GViewGladeB>(parent, _("TeX Information"), false),
 	  activeStyle(ControlTexinfo::cls)
 {}
 
diff --git a/src/frontends/gtk/GThesaurus.C b/src/frontends/gtk/GThesaurus.C
index 331995ef96..dc024e42ae 100644
--- a/src/frontends/gtk/GThesaurus.C
+++ b/src/frontends/gtk/GThesaurus.C
@@ -44,7 +44,7 @@ synModelColumns synColumns;
 
 
 GThesaurus::GThesaurus(Dialog & parent)
-	: GViewCB<ControlThesaurus, GViewGladeB>(parent, lyx::to_utf8(_("Thesaurus")), false)
+	: GViewCB<ControlThesaurus, GViewGladeB>(parent, _("Thesaurus"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GToc.C b/src/frontends/gtk/GToc.C
index 3eee0a40ab..417ddb186b 100644
--- a/src/frontends/gtk/GToc.C
+++ b/src/frontends/gtk/GToc.C
@@ -30,7 +30,7 @@ namespace lyx {
 namespace frontend {
 
 GToc::GToc(Dialog & parent)
-	: GViewCB<ControlToc, GViewGladeB>(parent, lyx::to_utf8(_("Table of Contents")), false)
+	: GViewCB<ControlToc, GViewGladeB>(parent, _("Table of Contents"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GUrl.C b/src/frontends/gtk/GUrl.C
index 76f344fa01..6b762dd65a 100644
--- a/src/frontends/gtk/GUrl.C
+++ b/src/frontends/gtk/GUrl.C
@@ -34,7 +34,7 @@ namespace frontend {
 
 
 GUrl::GUrl(Dialog & parent)
-	: GViewCB<ControlCommand, GViewGladeB>(parent, lyx::to_utf8(_("URL")))
+	: GViewCB<ControlCommand, GViewGladeB>(parent, _("URL"))
 {
 }
 
diff --git a/src/frontends/gtk/GVSpace.C b/src/frontends/gtk/GVSpace.C
index f3e3aeed8e..44991567a2 100644
--- a/src/frontends/gtk/GVSpace.C
+++ b/src/frontends/gtk/GVSpace.C
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 GVSpace::GVSpace(Dialog & parent)
-	: GViewCB<ControlVSpace, GViewGladeB>(parent, lyx::to_utf8(_("VSpace Settings")), false)
+	: GViewCB<ControlVSpace, GViewGladeB>(parent, _("VSpace Settings"), false)
 {}
 
 
diff --git a/src/frontends/gtk/GViewBase.C b/src/frontends/gtk/GViewBase.C
index 71dfdefe03..205bb8246c 100644
--- a/src/frontends/gtk/GViewBase.C
+++ b/src/frontends/gtk/GViewBase.C
@@ -21,12 +21,14 @@
 #include "GViewBase.h"
 #include "support/filetools.h"
 
+using lyx::docstring;
+
 using std::string;
 
 namespace lyx {
 namespace frontend {
 
-GViewBase::GViewBase(Dialog & parent, string const & t, bool allowResize) :
+GViewBase::GViewBase(Dialog & parent, docstring const & t, bool allowResize) :
 	Dialog::View(parent, t), allowResize_(allowResize)
 {
 }
@@ -115,7 +117,7 @@ void GViewBase::setRestore(Gtk::Button * restore)
 }
 
 
-void GViewBase::setTitle(std::string const & title)
+void GViewBase::setTitle(lyx::docstring const & title)
 {
 	Dialog::View::setTitle(title);
 	window()->set_title(title);
diff --git a/src/frontends/gtk/GViewBase.h b/src/frontends/gtk/GViewBase.h
index c289d5d3a0..bfa05ae4c7 100644
--- a/src/frontends/gtk/GViewBase.h
+++ b/src/frontends/gtk/GViewBase.h
@@ -32,7 +32,7 @@ public:
 	void setApply(Gtk::Button * apply);
 	void setOK(Gtk::Button * ok);
 	void setRestore(Gtk::Button * restore);
-	void setTitle(std::string const &);
+	void setTitle(lyx::doctring const &);
 	bool readOnly() const;
 protected:
 	// Build the dialog
@@ -103,12 +103,12 @@ public:
 	Controller & controller();
 	Controller const & controller() const;
 protected:
-	GViewCB(Dialog & parent, std::string const & t, bool allowResize = false);
+	GViewCB(Dialog & parent, lyx::docstring const & t, bool allowResize = false);
 };
 
 
 template <class Controller, class Base>
-GViewCB<Controller, Base>::GViewCB(Dialog & parent, std::string const & t,
+GViewCB<Controller, Base>::GViewCB(Dialog & parent, lyx::docstring const & t,
 				   bool allowResize) :
 	Base(parent, t, allowResize)
 {
diff --git a/src/frontends/gtk/GWrap.C b/src/frontends/gtk/GWrap.C
index 20c2dc656a..1435e4ee68 100644
--- a/src/frontends/gtk/GWrap.C
+++ b/src/frontends/gtk/GWrap.C
@@ -32,7 +32,7 @@ namespace lyx {
 namespace frontend {
 
 GWrap::GWrap(Dialog & parent)
-	: GViewCB<ControlWrap, GViewGladeB>(parent, lyx::to_utf8(_("Text Wrap Settings")), false)
+	: GViewCB<ControlWrap, GViewGladeB>(parent, _("Text Wrap Settings"), false)
 {}
 
 
diff --git a/src/frontends/qt3/QAbout.C b/src/frontends/qt3/QAbout.C
index b6f03cfbc7..50588c1bb7 100644
--- a/src/frontends/qt3/QAbout.C
+++ b/src/frontends/qt3/QAbout.C
@@ -41,7 +41,7 @@ namespace frontend {
 typedef QController<ControlAboutlyx, QView<QAboutDialog> > base_class;
 
 QAbout::QAbout(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("About LyX")))
+	: base_class(parent, _("About LyX"))
 {
 }
 
diff --git a/src/frontends/qt3/QBibitem.C b/src/frontends/qt3/QBibitem.C
index e338343788..5d4ea733a5 100644
--- a/src/frontends/qt3/QBibitem.C
+++ b/src/frontends/qt3/QBibitem.C
@@ -28,7 +28,7 @@ typedef QController<ControlCommand, QView<QBibitemDialog> > base_class;
 
 
 QBibitem::QBibitem(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Bibliography Entry Settings")))
+	: base_class(parent, _("Bibliography Entry Settings"))
 {
 }
 
diff --git a/src/frontends/qt3/QBibtex.C b/src/frontends/qt3/QBibtex.C
index bb64313984..2a1e30b826 100644
--- a/src/frontends/qt3/QBibtex.C
+++ b/src/frontends/qt3/QBibtex.C
@@ -45,7 +45,7 @@ namespace frontend {
 typedef QController<ControlBibtex, QView<QBibtexDialog> > base_class;
 
 QBibtex::QBibtex(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("BibTeX Bibliography")))
+	: base_class(parent, _("BibTeX Bibliography"))
 {
 }
 
diff --git a/src/frontends/qt3/QBox.C b/src/frontends/qt3/QBox.C
index fec3843b38..65a64c4283 100644
--- a/src/frontends/qt3/QBox.C
+++ b/src/frontends/qt3/QBox.C
@@ -48,7 +48,7 @@ namespace frontend {
 typedef QController<ControlBox, QView<QBoxDialog> > base_class;
 
 QBox::QBox(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Box Settings")))
+	: base_class(parent, _("Box Settings"))
 {}
 
 
diff --git a/src/frontends/qt3/QBranch.C b/src/frontends/qt3/QBranch.C
index 2560218009..a5ba149ebb 100644
--- a/src/frontends/qt3/QBranch.C
+++ b/src/frontends/qt3/QBranch.C
@@ -33,7 +33,7 @@ typedef QController<ControlBranch, QView<QBranchDialog> > base_class;
 
 
 QBranch::QBranch(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Branch Settings")))
+	: base_class(parent, _("Branch Settings"))
 {}
 
 
diff --git a/src/frontends/qt3/QChanges.C b/src/frontends/qt3/QChanges.C
index fe86376ce0..ad8b18f799 100644
--- a/src/frontends/qt3/QChanges.C
+++ b/src/frontends/qt3/QChanges.C
@@ -33,7 +33,7 @@ typedef QController<ControlChanges, QView<QChangesDialog> > base_class;
 
 
 QChanges::QChanges(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Merge Changes")))
+	: base_class(parent, _("Merge Changes"))
 {
 }
 
diff --git a/src/frontends/qt3/QCharacter.C b/src/frontends/qt3/QCharacter.C
index 04ef3c5202..ef92642f71 100644
--- a/src/frontends/qt3/QCharacter.C
+++ b/src/frontends/qt3/QCharacter.C
@@ -32,7 +32,7 @@ typedef QController<ControlCharacter, QView<QCharacterDialog> > base_class;
 
 
 QCharacter::QCharacter(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Text Style")))
+	: base_class(parent, _("Text Style"))
 {
 }
 
diff --git a/src/frontends/qt3/QCitation.C b/src/frontends/qt3/QCitation.C
index 0728fae85b..8055ec32ca 100644
--- a/src/frontends/qt3/QCitation.C
+++ b/src/frontends/qt3/QCitation.C
@@ -47,7 +47,7 @@ namespace frontend {
 typedef QController<ControlCitation, QView<QCitationDialog> > base_class;
 
 QCitation::QCitation(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Citation")))
+	: base_class(parent, _("Citation"))
 {}
 
 
diff --git a/src/frontends/qt3/QDocument.C b/src/frontends/qt3/QDocument.C
index 3426c4f55c..deb44e3945 100644
--- a/src/frontends/qt3/QDocument.C
+++ b/src/frontends/qt3/QDocument.C
@@ -67,7 +67,7 @@ char const * encodings[] = { "LaTeX default", "latin1", "latin2",
 
 
 QDocument::QDocument(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Document Settings"))),
+	: base_class(parent, _("Document Settings")),
 		lang_(getSecond(getLanguageData(false)))
 {}
 
diff --git a/src/frontends/qt3/QERT.C b/src/frontends/qt3/QERT.C
index c766fcaf27..fcf4083219 100644
--- a/src/frontends/qt3/QERT.C
+++ b/src/frontends/qt3/QERT.C
@@ -27,7 +27,7 @@ typedef QController<ControlERT, QView<QERTDialog> > base_class;
 
 
 QERT::QERT(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("TeX Code Settings")))
+	: base_class(parent, _("TeX Code Settings"))
 {
 }
 
diff --git a/src/frontends/qt3/QErrorList.C b/src/frontends/qt3/QErrorList.C
index 639510f733..c35afe8298 100644
--- a/src/frontends/qt3/QErrorList.C
+++ b/src/frontends/qt3/QErrorList.C
@@ -27,7 +27,7 @@ namespace frontend {
 typedef QController<ControlErrorList, QView<QErrorListDialog> > base_class;
 
 QErrorList::QErrorList(Dialog & parent)
-	: base_class(parent, "")
+	: base_class(parent, lyx::docstring())
 {}
 
 
@@ -47,7 +47,7 @@ void QErrorList::select(int item)
 
 void QErrorList::update_contents()
 {
-	setTitle(controller().name());
+	setTitle(lyx::from_ascii(controller().name()));
 	dialog_->errorsLB->clear();
 	dialog_->descriptionTB->setText(QString());
 
diff --git a/src/frontends/qt3/QExternal.C b/src/frontends/qt3/QExternal.C
index 70f15a756a..ec342dab5b 100644
--- a/src/frontends/qt3/QExternal.C
+++ b/src/frontends/qt3/QExternal.C
@@ -277,7 +277,7 @@ void getExtra(external::ExtraData & data,
 typedef QController<ControlExternal, QView<QExternalDialog> > base_class;
 
 QExternal::QExternal(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("External Material")))
+	: base_class(parent, _("External Material"))
 {}
 
 
diff --git a/src/frontends/qt3/QFloat.C b/src/frontends/qt3/QFloat.C
index e7988d2f07..c08f09400d 100644
--- a/src/frontends/qt3/QFloat.C
+++ b/src/frontends/qt3/QFloat.C
@@ -28,7 +28,7 @@ typedef QController<ControlFloat, QView<QFloatDialog> > base_class;
 
 
 QFloat::QFloat(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Float Settings")))
+	: base_class(parent, _("Float Settings"))
 {
 }
 
diff --git a/src/frontends/qt3/QGraphics.C b/src/frontends/qt3/QGraphics.C
index 2215c073da..4fb844d397 100644
--- a/src/frontends/qt3/QGraphics.C
+++ b/src/frontends/qt3/QGraphics.C
@@ -57,7 +57,7 @@ namespace frontend {
 typedef QController<ControlGraphics, QView<QGraphicsDialog> > base_class;
 
 QGraphics::QGraphics(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Graphics")))
+	: base_class(parent, _("Graphics"))
 {
 }
 
diff --git a/src/frontends/qt3/QInclude.C b/src/frontends/qt3/QInclude.C
index bb69c54f96..df6ac70f87 100644
--- a/src/frontends/qt3/QInclude.C
+++ b/src/frontends/qt3/QInclude.C
@@ -36,7 +36,7 @@ typedef QController<ControlInclude, QView<QIncludeDialog> > base_class;
 
 
 QInclude::QInclude(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Child Document")))
+	: base_class(parent, _("Child Document"))
 {}
 
 
diff --git a/src/frontends/qt3/QIndex.C b/src/frontends/qt3/QIndex.C
index a3cf1e6be5..0bcae0cdcd 100644
--- a/src/frontends/qt3/QIndex.C
+++ b/src/frontends/qt3/QIndex.C
@@ -30,7 +30,7 @@ namespace frontend {
 typedef QController<ControlCommand, QView<QIndexDialog> > base_class;
 
 
-QIndex::QIndex(Dialog & parent, string const & title, QString const & label)
+QIndex::QIndex(Dialog & parent, docstring const & title, QString const & label)
 	: base_class(parent, title), label_(label)
 {
 }
diff --git a/src/frontends/qt3/QLog.C b/src/frontends/qt3/QLog.C
index 4bc69419a2..d387551d05 100644
--- a/src/frontends/qt3/QLog.C
+++ b/src/frontends/qt3/QLog.C
@@ -27,7 +27,7 @@ namespace frontend {
 typedef QController<ControlLog, QView<QLogDialog> > base_class;
 
 QLog::QLog(Dialog & parent)
-	: base_class(parent, "")
+: base_class(parent, lyx::docstring())
 {}
 
 
diff --git a/src/frontends/qt3/QMath.C b/src/frontends/qt3/QMath.C
index f50b92774f..59e6ce6d0c 100644
--- a/src/frontends/qt3/QMath.C
+++ b/src/frontends/qt3/QMath.C
@@ -24,7 +24,7 @@ typedef QController<ControlMath, QView<QMathDialog> > math_base;
 
 
 QMath::QMath(Dialog & parent)
-	: math_base(parent, lyx::to_utf8(_("Math Panel")))
+	: math_base(parent, _("Math Panel"))
 {}
 
 
@@ -38,7 +38,7 @@ typedef QController<ControlMath, QView<QMathMatrixDialog> > matrix_base;
 
 
 QMathMatrix::QMathMatrix(Dialog & parent)
-	: matrix_base(parent, lyx::to_utf8(_("Math Matrix")))
+	: matrix_base(parent, _("Math Matrix"))
 {}
 
 
@@ -52,7 +52,7 @@ typedef QController<ControlMath, QView<QDelimiterDialog> > delimiter_base;
 
 
 QMathDelimiter::QMathDelimiter(Dialog & parent)
-	: delimiter_base(parent, lyx::to_utf8(_("Math Delimiter")))
+	: delimiter_base(parent, _("Math Delimiter"))
 {}
 
 
diff --git a/src/frontends/qt3/QNote.C b/src/frontends/qt3/QNote.C
index 20f45c14cd..6e3f9f9a6f 100644
--- a/src/frontends/qt3/QNote.C
+++ b/src/frontends/qt3/QNote.C
@@ -31,7 +31,7 @@ typedef QController<ControlNote, QView<QNoteDialog> > base_class;
 
 
 QNote::QNote(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Note Settings")))
+	: base_class(parent, _("Note Settings"))
 {}
 
 
diff --git a/src/frontends/qt3/QParagraph.C b/src/frontends/qt3/QParagraph.C
index 80094bf692..adde93c02b 100644
--- a/src/frontends/qt3/QParagraph.C
+++ b/src/frontends/qt3/QParagraph.C
@@ -37,7 +37,7 @@ typedef QController<ControlParagraph, QView<QParagraphDialog> > base_class;
 
 
 QParagraph::QParagraph(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Paragraph Settings")))
+	: base_class(parent, _("Paragraph Settings"))
 {}
 
 
diff --git a/src/frontends/qt3/QPrefs.C b/src/frontends/qt3/QPrefs.C
index ec37d9d6ec..c0a874bfda 100644
--- a/src/frontends/qt3/QPrefs.C
+++ b/src/frontends/qt3/QPrefs.C
@@ -79,7 +79,7 @@ namespace frontend {
 typedef QController<ControlPrefs, QView<QPrefsDialog> > base_class;
 
 QPrefs::QPrefs(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Preferences")))
+	: base_class(parent, _("Preferences"))
 {
 }
 
diff --git a/src/frontends/qt3/QPrint.C b/src/frontends/qt3/QPrint.C
index 6626c7c472..325fc3c4cb 100644
--- a/src/frontends/qt3/QPrint.C
+++ b/src/frontends/qt3/QPrint.C
@@ -33,7 +33,7 @@ typedef QController<ControlPrint, QView<QLPrintDialog> > base_class;
 
 
 QPrint::QPrint(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Print Document")))
+	: base_class(parent, _("Print Document"))
 {
 }
 
diff --git a/src/frontends/qt3/QRef.C b/src/frontends/qt3/QRef.C
index c6f5e70899..0b33f3b72c 100644
--- a/src/frontends/qt3/QRef.C
+++ b/src/frontends/qt3/QRef.C
@@ -39,7 +39,7 @@ typedef QController<ControlRef, QView<QRefDialog> > base_class;
 
 
 QRef::QRef(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Cross-reference"))),
+	: base_class(parent, _("Cross-reference")),
 	sort_(false), at_ref_(false)
 {
 }
diff --git a/src/frontends/qt3/QSearch.C b/src/frontends/qt3/QSearch.C
index 2393b4dc53..7d0d55c1f1 100644
--- a/src/frontends/qt3/QSearch.C
+++ b/src/frontends/qt3/QSearch.C
@@ -28,7 +28,7 @@ typedef QController<ControlSearch, QView<QSearchDialog> > base_class;
 
 
 QSearch::QSearch(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Find and Replace")))
+	: base_class(parent, _("Find and Replace"))
 {
 }
 
diff --git a/src/frontends/qt3/QSendto.C b/src/frontends/qt3/QSendto.C
index 6e4bedd92e..ce11b5545e 100644
--- a/src/frontends/qt3/QSendto.C
+++ b/src/frontends/qt3/QSendto.C
@@ -33,7 +33,7 @@ typedef QController<ControlSendto, QView<QSendtoDialog> > base_class;
 
 
 QSendto::QSendto(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Send Document to Command")))
+	: base_class(parent, _("Send Document to Command"))
 {
 }
 
diff --git a/src/frontends/qt3/QShowFile.C b/src/frontends/qt3/QShowFile.C
index 7e3b160532..996cabaf72 100644
--- a/src/frontends/qt3/QShowFile.C
+++ b/src/frontends/qt3/QShowFile.C
@@ -29,7 +29,7 @@ typedef QController<ControlShowFile, QView<QShowFileDialog> > base_class;
 
 
 QShowFile::QShowFile(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Show File")))
+	: base_class(parent, _("Show File"))
 {
 }
 
diff --git a/src/frontends/qt3/QSpellchecker.C b/src/frontends/qt3/QSpellchecker.C
index 7d7ee002dc..680086a4db 100644
--- a/src/frontends/qt3/QSpellchecker.C
+++ b/src/frontends/qt3/QSpellchecker.C
@@ -32,7 +32,7 @@ typedef QController<ControlSpellchecker, QView<QSpellcheckerDialog> > base_class
 
 
 QSpellchecker::QSpellchecker(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Spellchecker")))
+	: base_class(parent, _("Spellchecker"))
 {}
 
 
diff --git a/src/frontends/qt3/QTabular.C b/src/frontends/qt3/QTabular.C
index e0a7b70ad7..dbe60bc803 100644
--- a/src/frontends/qt3/QTabular.C
+++ b/src/frontends/qt3/QTabular.C
@@ -39,7 +39,7 @@ namespace frontend {
 typedef QController<ControlTabular, QView<QTabularDialog> > base_class;
 
 QTabular::QTabular(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Table Settings")))
+	: base_class(parent, _("Table Settings"))
 {
 }
 
diff --git a/src/frontends/qt3/QTabularCreate.C b/src/frontends/qt3/QTabularCreate.C
index faea739a5c..1bd9701c0f 100644
--- a/src/frontends/qt3/QTabularCreate.C
+++ b/src/frontends/qt3/QTabularCreate.C
@@ -26,7 +26,7 @@ typedef QController<ControlTabularCreate, QView<QTabularCreateDialog> > base_cla
 
 
 QTabularCreate::QTabularCreate(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Insert Table")))
+	: base_class(parent, _("Insert Table"))
 {
 }
 
diff --git a/src/frontends/qt3/QTexinfo.C b/src/frontends/qt3/QTexinfo.C
index b0b3a15018..87055d2fd0 100644
--- a/src/frontends/qt3/QTexinfo.C
+++ b/src/frontends/qt3/QTexinfo.C
@@ -31,7 +31,7 @@ namespace frontend {
 typedef QController<ControlTexinfo, QView<QTexinfoDialog> > base_class;
 
 QTexinfo::QTexinfo(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("TeX Information"))),
+	: base_class(parent, _("TeX Information")),
 	  warningPosted(false), activeStyle(ControlTexinfo::cls)
 {
 }
diff --git a/src/frontends/qt3/QThesaurus.C b/src/frontends/qt3/QThesaurus.C
index 40dca16cda..9d08737ae4 100644
--- a/src/frontends/qt3/QThesaurus.C
+++ b/src/frontends/qt3/QThesaurus.C
@@ -26,7 +26,7 @@ namespace frontend {
 typedef QController<ControlThesaurus, QView<QThesaurusDialog> > base_class;
 
 QThesaurus::QThesaurus(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Thesaurus")))
+	: base_class(parent, _("Thesaurus"))
 {
 }
 
diff --git a/src/frontends/qt3/QToc.C b/src/frontends/qt3/QToc.C
index f3446a31fb..ac60a70f06 100644
--- a/src/frontends/qt3/QToc.C
+++ b/src/frontends/qt3/QToc.C
@@ -38,7 +38,7 @@ namespace frontend {
 typedef QController<ControlToc, QView<QTocDialog> > base_class;
 
 QToc::QToc(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Table of Contents"))), depth_(1)
+	: base_class(parent, _("Table of Contents")), depth_(1)
 {}
 
 
@@ -66,7 +66,7 @@ void QToc::updateType()
 		dialog_->typeCO->insertItem(toqstr(guiname));
 		if (*it == type) {
 			dialog_->typeCO->setCurrentItem(it - choice.begin());
-			setTitle(guiname);
+			setTitle(lyx::from_ascii(guiname));
 		}
 	}
 	type_ = type;
diff --git a/src/frontends/qt3/QURL.C b/src/frontends/qt3/QURL.C
index 0636d0d8ce..cd8324df1e 100644
--- a/src/frontends/qt3/QURL.C
+++ b/src/frontends/qt3/QURL.C
@@ -30,7 +30,7 @@ namespace frontend {
 typedef QController<ControlCommand, QView<QURLDialog> > base_class;
 
 QURL::QURL(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("URL")))
+	: base_class(parent, _("URL"))
 {
 }
 
diff --git a/src/frontends/qt3/QVSpace.C b/src/frontends/qt3/QVSpace.C
index 11749920e1..e968a08b75 100644
--- a/src/frontends/qt3/QVSpace.C
+++ b/src/frontends/qt3/QVSpace.C
@@ -130,7 +130,7 @@ VSpace setVSpaceFromWidgets(int spacing,
 typedef QController<ControlVSpace, QView<QVSpaceDialog> > base_class;
 
 QVSpace::QVSpace(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Vertical Space Settings")))
+	: base_class(parent, _("Vertical Space Settings"))
 {}
 
 
diff --git a/src/frontends/qt3/QViewSource.C b/src/frontends/qt3/QViewSource.C
index b8f372ff5c..174fdd9503 100644
--- a/src/frontends/qt3/QViewSource.C
+++ b/src/frontends/qt3/QViewSource.C
@@ -32,7 +32,7 @@ namespace frontend {
 typedef QController<ControlViewSource, QView<QViewSourceDialog> > base_class;
 
 QViewSource::QViewSource(Dialog & parent)
-	: base_class(parent, "")
+	: base_class(parent, lyx::docstring())
 {}
 
 
diff --git a/src/frontends/qt3/QWrap.C b/src/frontends/qt3/QWrap.C
index b0be065a51..d6aac12e89 100644
--- a/src/frontends/qt3/QWrap.C
+++ b/src/frontends/qt3/QWrap.C
@@ -36,7 +36,7 @@ namespace frontend {
 typedef QController<ControlWrap, QView<QWrapDialog> > base_class;
 
 QWrap::QWrap(Dialog & parent)
-	: base_class(parent, lyx::to_utf8(_("Text Wrap Settings")))
+	: base_class(parent, _("Text Wrap Settings"))
 {
 }
 
-- 
2.39.2