Patch 1 Log:

* controllers/Dialog.[Ch]
  - View::title_ is now a docstring (ctor and access functions changed)

* controllers/ControlLog.[Ch]
  - title() now returns a docstring

* controllers/ControlLog.[Ch]
  - title() now returns a docstring

* qt4/*: adapted to above changes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15283 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/ControlLog.C b/src/frontends/controllers/ControlLog.C
index 026319f215ca54239559d5d9165738f67c5b57c1..e138e67a12027debcbb4a56b2a6c7121b62d7625 100644 (file)
--- a/src/frontends/controllers/ControlLog.C
+++ b/src/frontends/controllers/ControlLog.C
@@ -19,6 +19,8 @@
 #include <sstream>
 #include <fstream>
 
+using lyx::docstring;
+
 using std::istringstream;
 using std::ostream;
 using std::string;
@@ -70,21 +72,21 @@ void ControlLog::clearParams()
 }
 
 
-string const ControlLog::title() const
+docstring const ControlLog::title() const
 {
-       string t;
+       docstring t;
        switch (type_) {
        case LatexLog:
-               t = lyx::to_utf8(_("LaTeX Log"));
+               t = _("LaTeX Log");
                break;
        case LiterateLog:
-               t = lyx::to_utf8(_("Literate Programming Build Log"));
+               t = _("Literate Programming Build Log");
                break;
        case Lyx2lyxLog:
-               t = lyx::to_utf8(_("lyx2lyx Error Log"));
+               t = _("lyx2lyx Error Log");
                break;
        case VCLog:
-               t = lyx::to_utf8(_("Version Control Log"));
+               t = _("Version Control Log");
                break;
        }
        return t;

diff --git a/src/frontends/controllers/ControlLog.h b/src/frontends/controllers/ControlLog.h
index 4ee3a03c9bdbe42e7aadae482f8632851d202932..0b02932c54c6166844b5e2346414fe3ad4720ad8 100644 (file)
--- a/src/frontends/controllers/ControlLog.h
+++ b/src/frontends/controllers/ControlLog.h
@@ -37,7 +37,7 @@ public:
        virtual bool isBufferDependent() const { return true; }
 
        /// The title displayed by the dialog reflects the \c LOGTYPE
-       std::string const title() const;
+       lyx::docstring const title() const;
        /// put the log file into the ostream
        void getContents(std::ostream & ss) const;
 

diff --git a/src/frontends/controllers/ControlViewSource.C b/src/frontends/controllers/ControlViewSource.C
index f1bfbd14ff88ec76a1ff3877f0c8adc144822f8d..47a7bca30f89b69e7d481c6d3fedaf5f775cc107 100644 (file)
--- a/src/frontends/controllers/ControlViewSource.C
+++ b/src/frontends/controllers/ControlViewSource.C
@@ -64,7 +64,7 @@ void ControlViewSource::clearParams()
 }
 
 
-string const ControlViewSource::title() const
+docstring const ControlViewSource::title() const
 {
        string source_type;
 
@@ -81,7 +81,7 @@ string const ControlViewSource::title() const
        default:
                BOOST_ASSERT(false);
        }
-       return lyx::to_utf8(_(source_type + " Source"));
+       return _(source_type + " Source");
 }
 
 } // namespace frontend

diff --git a/src/frontends/controllers/ControlViewSource.h b/src/frontends/controllers/ControlViewSource.h
index f65d57e5b8b9b5955de9f3c470630babf0fe891d..16598cfbf6e652fd40aaae5ae4ca1b7279f5a8ae 100644 (file)
--- a/src/frontends/controllers/ControlViewSource.h
+++ b/src/frontends/controllers/ControlViewSource.h
@@ -37,7 +37,7 @@ public:
        virtual bool isBufferDependent() const { return true; }
 
        /// The title displayed by the dialog reflects source type. 
-       std::string const title() const;
+       lyx::docstring const title() const;
 
        /** get the source code of selected paragraphs, or the whole document
                \param fullSource get full source code

diff --git a/src/frontends/controllers/Dialog.C b/src/frontends/controllers/Dialog.C
index 23b4ad8d271e6080f6b96e9208e119bc121533ce..a25f9bcdef553257ef90adadbc6a7b13497f4382 100644 (file)
--- a/src/frontends/controllers/Dialog.C
+++ b/src/frontends/controllers/Dialog.C
@@ -21,6 +21,7 @@
 #include "FuncStatus.h"
 #include "lyxfunc.h"
 
+using lyx::docstring;
 
 using std::string;
 
@@ -219,7 +220,7 @@ Dialog::Controller & Dialog::controller() const
 }
 
 
-Dialog::View::View(Dialog & parent, string title) :
+Dialog::View::View(Dialog & parent, docstring title) :
        p_(parent), title_(title)
 {}
 
@@ -231,13 +232,13 @@ Dialog::View & Dialog::view() const
 }
 
 
-void Dialog::View::setTitle(string const & newtitle)
+void Dialog::View::setTitle(docstring const & newtitle)
 {
        title_ = newtitle;
 }
 
 
-string const & Dialog::View::getTitle() const
+docstring const & Dialog::View::getTitle() const
 {
        return title_;
 }

diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h
index cb5222215ebe74d156cd49615885af23e52fdde8..cd0e677c906319d6e1dcb83745373350ffce30e6 100644 (file)
--- a/src/frontends/controllers/Dialog.h
+++ b/src/frontends/controllers/Dialog.h
@@ -15,6 +15,8 @@
 #include "Kernel.h"
 #include "lfuns.h"
 
+#include "support/docstring.h"
+
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 
@@ -219,7 +221,7 @@ public:
        /** \param parent Dialog owning this Controller.
         *  \param title  is the dialog title displayed by the WM.
         */
-       View(Dialog & parent, std::string title);
+       View(Dialog & parent, lyx::docstring title);
        virtual ~View() {}
 
        /** \name Generic View
@@ -257,9 +259,9 @@ public:
        virtual void partialUpdate(int id);
 
        /// sets the title of the dialog (window caption)
-       void setTitle(std::string const &);
+       void setTitle(lyx::docstring const &);
        /// gets the title of the dialog (window caption)
-       std::string const & getTitle() const;
+       lyx::docstring const & getTitle() const;
 
        /** \name View Access
         *  Enable the derived classes to access the other parts of the whole.
@@ -281,7 +283,7 @@ protected:
 
 private:
        Dialog & p_;
-       std::string title_;
+       lyx::docstring title_;
 };
 
 } // namespace frontend

diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 50a5ba63a5f4cd2cdf9a1a7230acd5952134d964..ed12343b84a34a39cf05170a26878e8bf047ee8b 100644 (file)
--- a/src/frontends/qt4/Dialogs.C
+++ b/src/frontends/qt4/Dialogs.C
@@ -213,13 +213,13 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
        } else if (name == "index") {
                dialog->setController(new ControlCommand(*dialog, name));
                dialog->setView(new QIndex(*dialog,
-                                          lyx::to_utf8(_("Index Entry")),
+                                          _("Index Entry"),
                                           qt_("&Keyword:")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "label") {
                dialog->setController(new ControlCommand(*dialog, name));
                dialog->setView(new QIndex(*dialog,
-                                          lyx::to_utf8(_("Label")),
+                                          _("Label"),
                                           qt_("&Label:")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "log") {

diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C
index 4457c2053979f041505343f497e52d1472f0ba16..ecfe9e3b18a1b0d61fe4237acc5d94cc9e4dfe8a 100644 (file)
--- a/src/frontends/qt4/QAbout.C
+++ b/src/frontends/qt4/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/qt4/QBibitem.C b/src/frontends/qt4/QBibitem.C
index e338343788aaf0c5f081ef7b7baff7e27883dc9a..5d4ea733a5c4d72c979d77470f491e58fd7b6627 100644 (file)
--- a/src/frontends/qt4/QBibitem.C
+++ b/src/frontends/qt4/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/qt4/QBibtex.C b/src/frontends/qt4/QBibtex.C
index b4bae450d3f742cf3611016f92d2d67f463be24f..fbc12f9e0243adb2567df0d52bdfdff08b4f9223 100644 (file)
--- a/src/frontends/qt4/QBibtex.C
+++ b/src/frontends/qt4/QBibtex.C
@@ -44,7 +44,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/qt4/QBox.C b/src/frontends/qt4/QBox.C
index 567a843f3a9264e7a25bb486f62854d0e837e817..64db6c3f388a38b416bd32ebb7d808140affd87e 100644 (file)
--- a/src/frontends/qt4/QBox.C
+++ b/src/frontends/qt4/QBox.C
@@ -46,7 +46,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/qt4/QBranch.C b/src/frontends/qt4/QBranch.C
index 033cd24fff5118bd9880d0238efc6da2a18c4881..002353cbcbe20b857bfeac2a4379a206685f9ecd 100644 (file)
--- a/src/frontends/qt4/QBranch.C
+++ b/src/frontends/qt4/QBranch.C
@@ -32,7 +32,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/qt4/QChanges.C b/src/frontends/qt4/QChanges.C
index a5e19d5c45802f60743f688c1237c12001d468f0..71504f55ba58679431f24d38120c6ac598f4c0db 100644 (file)
--- a/src/frontends/qt4/QChanges.C
+++ b/src/frontends/qt4/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/qt4/QCharacter.C b/src/frontends/qt4/QCharacter.C
index 5574dd618adb67ec20d58cef6ac24844a9d405b6..70ff96fe837fbdc02eb9a6709dbd1bef3108b34d 100644 (file)
--- a/src/frontends/qt4/QCharacter.C
+++ b/src/frontends/qt4/QCharacter.C
@@ -31,7 +31,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/qt4/QCitationDialog.C b/src/frontends/qt4/QCitationDialog.C
index d53a8f9e9c83c22359050e052303e7c73e0ab2db..abf88739d7d90923bbdf05bb3b50dc37d9657fed 100644 (file)
--- a/src/frontends/qt4/QCitationDialog.C
+++ b/src/frontends/qt4/QCitationDialog.C
@@ -17,6 +17,7 @@
 #include "qt_helpers.h"
 
 #include "bufferparams.h"
+#include "gettext.h"
 
 #include "controllers/ControlCitation.h"
 
@@ -37,7 +38,7 @@ namespace frontend {
 
 
 QCitationDialog::QCitationDialog(Dialog & dialog, QCitation * form)
-       : Dialog::View(dialog, "Citation"), form_(form)
+       : Dialog::View(dialog, _("Citation")), form_(form)
 {
        setupUi(this);
 

diff --git a/src/frontends/qt4/QDialogView.C b/src/frontends/qt4/QDialogView.C
index de25f40122e8cd22f39f26dbdd1380718f79bbbe..efdc7368c9144a7ae6990a2e74b0b68fe23701b9 100644 (file)
--- a/src/frontends/qt4/QDialogView.C
+++ b/src/frontends/qt4/QDialogView.C
@@ -16,10 +16,12 @@
 
 #include "controllers/ButtonController.h"
 
+using lyx::docstring;
+
 namespace lyx {
 namespace frontend {
 
-QDialogView::QDialogView(Dialog & parent, std::string const & t)
+QDialogView::QDialogView(Dialog & parent, docstring const & t)
        : Dialog::View(parent,t), updating_(false)
 {}
 

diff --git a/src/frontends/qt4/QDialogView.h b/src/frontends/qt4/QDialogView.h
index 06d2e999a8035068bfdf025ab4646528946a50b5..bce1a8c6b6bc93eca94084ef787813c2c1d923d4 100644 (file)
--- a/src/frontends/qt4/QDialogView.h
+++ b/src/frontends/qt4/QDialogView.h
@@ -31,7 +31,7 @@ class QDialogView : public QObject, public Dialog::View {
        Q_OBJECT
 public:
        ///
-       QDialogView(Dialog &, std::string const &);
+       QDialogView(Dialog &, lyx::docstring const &);
        ///
        virtual ~QDialogView() {}
        ///
@@ -87,7 +87,7 @@ private:
 template <class GUIDialog>
 class QView: public QDialogView {
 protected:
-       QView(Dialog &, std::string const &);
+       QView(Dialog &, lyx::docstring const &);
 
        /// update the dialog
        virtual void update();
@@ -105,7 +105,7 @@ protected:
 
 
 template <class GUIDialog>
-QView<GUIDialog>::QView(Dialog & p, std::string const & t)
+QView<GUIDialog>::QView(Dialog & p, lyx::docstring const & t)
        : QDialogView(p, t)
 {}
 
@@ -153,7 +153,7 @@ class QController: public Base
 {
 protected:
        ///
-       QController(Dialog &, std::string const &);
+       QController(Dialog &, docstring const &);
 public:
        /// The parent controller
        Controller & controller();
@@ -163,7 +163,7 @@ public:
 
 
 template <class Controller, class Base>
-QController<Controller, Base>::QController(Dialog & p, std::string const & t)
+QController<Controller, Base>::QController(Dialog & p, docstring const & t)
        : Base(p, t)
 {}
 

diff --git a/src/frontends/qt4/QDocument.C b/src/frontends/qt4/QDocument.C
index 5094e5e185f341479426dee755d8e8a870ff76cc..e357eee876a863668513c9e82c01dcaf102faadd 100644 (file)
--- a/src/frontends/qt4/QDocument.C
+++ b/src/frontends/qt4/QDocument.C
@@ -45,7 +45,7 @@ typedef QController<ControlDocument, QView<QDocumentDialog> > base_class;
 
 
 QDocument::QDocument(Dialog & parent)
-       : base_class(parent, lyx::to_utf8(_("Document Settings")))
+       : base_class(parent, _("Document Settings"))
 {}
 
 

diff --git a/src/frontends/qt4/QERT.C b/src/frontends/qt4/QERT.C
index c766fcaf27b865d4d3ca7e1e20aafb5b546be7b8..fcf40832196eddf82bb37820afca7f68e0688b1b 100644 (file)
--- a/src/frontends/qt4/QERT.C
+++ b/src/frontends/qt4/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/qt4/QErrorList.C b/src/frontends/qt4/QErrorList.C
index 6d0605ef394c8edd6ba9d75b35b012c557a098cb..fd845183565fc639d698c9cf8bcad6d4eb6879a4 100644 (file)
--- a/src/frontends/qt4/QErrorList.C
+++ b/src/frontends/qt4/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())
 {}
 
 
@@ -48,7 +48,7 @@ void QErrorList::select(QListWidgetItem * wi)
 
 void QErrorList::update_contents()
 {
-       setTitle(controller().name());
+       setTitle(lyx::from_ascii(controller().name()));
        dialog_->errorsLW->clear();
        dialog_->descriptionTB->setPlainText(QString());
 

diff --git a/src/frontends/qt4/QExternal.C b/src/frontends/qt4/QExternal.C
index 73967cd05920c26668fc835164ed7424baf6a567..3df19563756f525dfb8d80b8c87ce19d7278e4c6 100644 (file)
--- a/src/frontends/qt4/QExternal.C
+++ b/src/frontends/qt4/QExternal.C
@@ -276,7 +276,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/qt4/QFloat.C b/src/frontends/qt4/QFloat.C
index 3d9cd6e85fd273f8c66cf50dc4f274519de52514..1d1ccfc581c70f547e19dfae85a124a2a661d223 100644 (file)
--- a/src/frontends/qt4/QFloat.C
+++ b/src/frontends/qt4/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/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C
index ed2340f4fd1c9d613f597bf872826efe7710c539..77cdbc670306b7e962072dcf1649fad2bbee5620 100644 (file)
--- a/src/frontends/qt4/QGraphics.C
+++ b/src/frontends/qt4/QGraphics.C
@@ -56,7 +56,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/qt4/QInclude.C b/src/frontends/qt4/QInclude.C
index 0a3243b946237878a7ac4921caf3e060b745a8d0..1241a1b7e84fd5a627d410c7a90512a25aca5384 100644 (file)
--- a/src/frontends/qt4/QInclude.C
+++ b/src/frontends/qt4/QInclude.C
@@ -35,7 +35,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/qt4/QIndex.C b/src/frontends/qt4/QIndex.C
index a3cf1e6be5e8e77a910f5eb5c1ea38010d7db3a4..0bcae0cdcd8c47604ac8d22499d8083e77d54f7f 100644 (file)
--- a/src/frontends/qt4/QIndex.C
+++ b/src/frontends/qt4/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/qt4/QIndex.h b/src/frontends/qt4/QIndex.h
index 020dbc097fbcfb8f6eb0d18918c8cd061ed81db1..1686af99a8190b6f75c25e7ad3a38dba5d250cc7 100644 (file)
--- a/src/frontends/qt4/QIndex.h
+++ b/src/frontends/qt4/QIndex.h
@@ -28,7 +28,7 @@ class QIndex :
 public:
        friend class QIndexDialog;
 
-       QIndex(Dialog &, std::string const & title, QString const & label);
+       QIndex(Dialog &, lyx::docstring const & title, QString const & label);
 protected:
        virtual bool isValid();
 private:

diff --git a/src/frontends/qt4/QLog.C b/src/frontends/qt4/QLog.C
index 48e76a59a9191a82ac93fa0242867569fc4f9f53..f975d38b9e841364ca0577606b4f073d6330c705 100644 (file)
--- a/src/frontends/qt4/QLog.C
+++ b/src/frontends/qt4/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/qt4/QMath.C b/src/frontends/qt4/QMath.C
index f50b92774f962c02d4c833d623404f78e5f2667e..59e6ce6d0cb560dcb896ac4eb69b396bf650f5e0 100644 (file)
--- a/src/frontends/qt4/QMath.C
+++ b/src/frontends/qt4/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/qt4/QNote.C b/src/frontends/qt4/QNote.C
index af1b5ab4baddd6397f9d9c98b3ce51c99677d383..24118ad6d551913276534593fb3bc12757b6373a 100644 (file)
--- a/src/frontends/qt4/QNote.C
+++ b/src/frontends/qt4/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/qt4/QParagraph.C b/src/frontends/qt4/QParagraph.C
index 4361f4ce397d81cb56540da6cda043b2b930e262..306a1ab5687b4ebd8c9952678c988c7c493ba671 100644 (file)
--- a/src/frontends/qt4/QParagraph.C
+++ b/src/frontends/qt4/QParagraph.C
@@ -35,7 +35,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/qt4/QPrefs.C b/src/frontends/qt4/QPrefs.C
index 063ed36b076c33727080d23b805463f497be70e5..62251df88a4c535385b14002a9d4c8845cd4a7b6 100644 (file)
--- a/src/frontends/qt4/QPrefs.C
+++ b/src/frontends/qt4/QPrefs.C
@@ -37,7 +37,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/qt4/QPrint.C b/src/frontends/qt4/QPrint.C
index 6626c7c472ebadec177998ff89d5de510ce52073..325fc3c4cb1493ba7a502000f050bf174148606b 100644 (file)
--- a/src/frontends/qt4/QPrint.C
+++ b/src/frontends/qt4/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/qt4/QRef.C b/src/frontends/qt4/QRef.C
index d559523bc65488d6b033a15fefc1f637e3363bf7..11984b30c44a4217a4df4cbc75adeca92b19a3fd 100644 (file)
--- a/src/frontends/qt4/QRef.C
+++ b/src/frontends/qt4/QRef.C
@@ -40,7 +40,7 @@ typedef QController<lyx::frontend::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/qt4/QSearch.C b/src/frontends/qt4/QSearch.C
index f1b427875ecc98e5027a3a4e5710bd361dfd76cb..bf83be2930df554228d053ad29dc361231a7c92f 100644 (file)
--- a/src/frontends/qt4/QSearch.C
+++ b/src/frontends/qt4/QSearch.C
@@ -27,7 +27,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/qt4/QSendto.C b/src/frontends/qt4/QSendto.C
index dbeca3c88cef50ef8ac11003906713d9bd3e8643..874c2d727eacfec50b6f1cf8ee6163c5e23668e3 100644 (file)
--- a/src/frontends/qt4/QSendto.C
+++ b/src/frontends/qt4/QSendto.C
@@ -32,7 +32,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/qt4/QShowFile.C b/src/frontends/qt4/QShowFile.C
index 1f9d75496d9540d32b8318ab6215e276dbc8d1cf..42789a4220f2c361556d2ae78afdc919d74115df 100644 (file)
--- a/src/frontends/qt4/QShowFile.C
+++ b/src/frontends/qt4/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/qt4/QSpellchecker.C b/src/frontends/qt4/QSpellchecker.C
index 45cb47676bb1aefb319a5016bdfa87b387f59a28..a07dbeb98df8252d0f4ebf51da47ce6be0935d38 100644 (file)
--- a/src/frontends/qt4/QSpellchecker.C
+++ b/src/frontends/qt4/QSpellchecker.C
@@ -31,7 +31,7 @@ namespace frontend {
 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/qt4/QTabular.C b/src/frontends/qt4/QTabular.C
index a07ccb5195c5bf7680216107abfbb54f79e83ed4..f42c12f1b4e9d6ceb633b8884a2558f0a9a38fed 100644 (file)
--- a/src/frontends/qt4/QTabular.C
+++ b/src/frontends/qt4/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/qt4/QTabularCreate.C b/src/frontends/qt4/QTabularCreate.C
index faea739a5cd6405c99802fa6be584d30769257aa..1bd9701c0ffa67f8f5e71d6c7c25605415c2618d 100644 (file)
--- a/src/frontends/qt4/QTabularCreate.C
+++ b/src/frontends/qt4/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/qt4/QTexinfo.C b/src/frontends/qt4/QTexinfo.C
index 797d3836336dad0e9718cb0dcab3b115e41b7d04..6556770173c121de502396bc8cda91631120e3f3 100644 (file)
--- a/src/frontends/qt4/QTexinfo.C
+++ b/src/frontends/qt4/QTexinfo.C
@@ -29,7 +29,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/qt4/QThesaurus.C b/src/frontends/qt4/QThesaurus.C
index 13b86f4daf5a7564d8011c8ffbd3fda86438d1df..ae324a1078f91da6a457ab8dffaa765f18384223 100644 (file)
--- a/src/frontends/qt4/QThesaurus.C
+++ b/src/frontends/qt4/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/qt4/QTocDialog.C b/src/frontends/qt4/QTocDialog.C
index 04753d8219877a917298f6e12b5b8c479c9a99c7..691aa566419c413477f6aea1638d6abad034ad1c 100644 (file)
--- a/src/frontends/qt4/QTocDialog.C
+++ b/src/frontends/qt4/QTocDialog.C
@@ -39,7 +39,7 @@ namespace lyx {
 namespace frontend {
 
 QTocDialog::QTocDialog(Dialog & dialog, QToc * form)
-       : Dialog::View(dialog, "Toc"), form_(form), depth_(2)
+       : Dialog::View(dialog, _("Toc")), form_(form), depth_(2)
 {
        setupUi(this);
 

diff --git a/src/frontends/qt4/QVSpace.C b/src/frontends/qt4/QVSpace.C
index b798409be9bc763f1b31dd9de0cf98cb438aea7a..7faa7341157d5612f88d0560175031ac12678571 100644 (file)
--- a/src/frontends/qt4/QVSpace.C
+++ b/src/frontends/qt4/QVSpace.C
@@ -129,7 +129,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/qt4/QViewSource.C b/src/frontends/qt4/QViewSource.C
index 46a989aa644b3804d908bfc8a4968f93ad38de28..f887063663dd65f11f4bfae4f947a6b901ccdc66 100644 (file)
--- a/src/frontends/qt4/QViewSource.C
+++ b/src/frontends/qt4/QViewSource.C
@@ -31,7 +31,7 @@ typedef QController<ControlViewSource, QView<QViewSourceDialog> > base_class;
 
 
 QViewSource::QViewSource(Dialog & parent)
-       : base_class(parent, "")
+       : base_class(parent, lyx::docstring())
 {}
 
 

diff --git a/src/frontends/qt4/QWrap.C b/src/frontends/qt4/QWrap.C
index f54c668bdf9a4d40211df00fb256382ce033a0da..a3befaa2b34b68a34a9629bd85bffad9158a3936 100644 (file)
--- a/src/frontends/qt4/QWrap.C
+++ b/src/frontends/qt4/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"))
 {
 }
 

diff --git a/src/frontends/qt4/UrlView.C b/src/frontends/qt4/UrlView.C
index 60a852053df1f6d3664db3c65def7bdfe50012c2..e416d96ac57c998fbee6ce201220f24924556a96 100644 (file)
--- a/src/frontends/qt4/UrlView.C
+++ b/src/frontends/qt4/UrlView.C
@@ -30,7 +30,7 @@ namespace frontend {
 typedef QController< ControlCommand, QView<QURLDialog> > base_class;
 
 UrlView::UrlView(Dialog & parent)
-       : base_class(parent, lyx::to_utf8(_("URL")))
+       : base_class(parent, _("URL"))
 {
 }