compilation fixes for qt3 after Abdel's latest changes

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

diff --git a/src/frontends/qt3/Dialogs.C b/src/frontends/qt3/Dialogs.C
index 7a18b2a0805e6029d9a74bb82aee4bc621c08bd3..cb78724ffe928ba1b4e616f16df23ed53750440c 100644 (file)
--- a/src/frontends/qt3/Dialogs.C
+++ b/src/frontends/qt3/Dialogs.C
@@ -216,13 +216,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/qt3/QDialogView.C b/src/frontends/qt3/QDialogView.C
index 8d92cc94d1deccf216bbe5232aba84feb5f8ed10..3523c99408b83750df20a9e0d98af0419f433bfa 100644 (file)
--- a/src/frontends/qt3/QDialogView.C
+++ b/src/frontends/qt3/QDialogView.C
@@ -19,7 +19,7 @@
 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/qt3/QDialogView.h b/src/frontends/qt3/QDialogView.h
index 41baaa5f22749f392db2044a004602894bdb8980..34da2fb3e416f27b17efe34d4a1e6825c430f8b5 100644 (file)
--- a/src/frontends/qt3/QDialogView.h
+++ b/src/frontends/qt3/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() {}
        ///
@@ -85,7 +85,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();
@@ -103,7 +103,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)
 {}
 
@@ -151,7 +151,7 @@ class QController: public Base
 {
 protected:
        ///
-       QController(Dialog &, std::string const &);
+       QController(Dialog &, lyx::docstring const &);
 public:
        /// The parent controller
        Controller & controller();
@@ -161,7 +161,7 @@ public:
 
 
 template <class Controller, class Base>
-QController<Controller, Base>::QController(Dialog & p, std::string const & t)
+QController<Controller, Base>::QController(Dialog & p, lyx::docstring const & t)
        : Base(p, t)
 {}
 

diff --git a/src/frontends/qt3/QIndex.h b/src/frontends/qt3/QIndex.h
index 020dbc097fbcfb8f6eb0d18918c8cd061ed81db1..1686af99a8190b6f75c25e7ad3a38dba5d250cc7 100644 (file)
--- a/src/frontends/qt3/QIndex.h
+++ b/src/frontends/qt3/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/qt3/QLToolbar.C b/src/frontends/qt3/QLToolbar.C
index 0143d30fcd1b192691ce88d6bd0e348c66af8b89..b29397da059e94d1ef6a142ab5192710885e3b70 100644 (file)
--- a/src/frontends/qt3/QLToolbar.C
+++ b/src/frontends/qt3/QLToolbar.C
@@ -174,7 +174,7 @@ QLToolbar::QLToolbar(ToolbarBackend::Toolbar const & tbb, LyXView & owner)
        ToolbarBackend::item_iterator it = tbb.items.begin();
        ToolbarBackend::item_iterator end = tbb.items.end();
        for (; it != end; ++it)
-               add(it->first, it->second);
+               add(it->first, lyx::from_utf8(it->second));
 }
 
 

diff --git a/src/frontends/qt3/QToc.C b/src/frontends/qt3/QToc.C
index ac60a70f06fce4c62990fc3591c5a600832e1aa0..0d35533166a594635039f8c9cc089d518f9c6d94 100644 (file)
--- a/src/frontends/qt3/QToc.C
+++ b/src/frontends/qt3/QToc.C
@@ -183,7 +183,7 @@ void QToc::updateToc(int newdepth)
                        - dialog_->tocLV->height() / 2);
                dialog_->tocLV->setSelected(selected_item, true);
        }
-       setTitle(fromqstr(dialog_->typeCO->currentText()));
+       setTitle(qstring_to_ucs4(dialog_->typeCO->currentText()));
 }