This makes qt3 compile again. Going in now.
JMarc
Index: src/frontends/qt3/QDialogView.C
===================================================================
--- src/frontends/qt3/QDialogView.C (revision 15287)
+++ src/frontends/qt3/QDialogView.C (working copy)
@@ -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)
{}
Index: src/frontends/qt3/QLToolbar.C
===================================================================
--- src/frontends/qt3/QLToolbar.C (revision 15287)
+++ src/frontends/qt3/QLToolbar.C (working copy)
@@ -174,7 +174,7 @@ QLToolbar::QLToolbar(ToolbarBackend::Too
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));
}
Index: src/frontends/qt3/QDialogView.h
===================================================================
--- src/frontends/qt3/QDialogView.h (revision 15287)
+++ src/frontends/qt3/QDialogView.h (working copy)
@@ -31,7 +31,7 @@ class QDialogView : public QObject, publ
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)
{}
Index: src/frontends/qt3/QToc.C
===================================================================
--- src/frontends/qt3/QToc.C (revision 15287)
+++ src/frontends/qt3/QToc.C (working copy)
@@ -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()));
}
Index: src/frontends/qt3/QIndex.h
===================================================================
--- src/frontends/qt3/QIndex.h (revision 15287)
+++ src/frontends/qt3/QIndex.h (working copy)
@@ -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:
Index: src/frontends/qt3/Dialogs.C
===================================================================
--- src/frontends/qt3/Dialogs.C (revision 15287)
+++ src/frontends/qt3/Dialogs.C (working copy)
@@ -216,13 +216,13 @@ Dialogs::DialogPtr Dialogs::build(string
} 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") {
