From 41d7e4c39493481be85a37834c0e1c545f3360f4 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 9 Oct 2006 16:08:27 +0000
Subject: [PATCH] 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
---
 src/frontends/qt3/Dialogs.C     |  4 ++--
 src/frontends/qt3/QDialogView.C |  2 +-
 src/frontends/qt3/QDialogView.h | 10 +++++-----
 src/frontends/qt3/QIndex.h      |  2 +-
 src/frontends/qt3/QLToolbar.C   |  2 +-
 src/frontends/qt3/QToc.C        |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/frontends/qt3/Dialogs.C b/src/frontends/qt3/Dialogs.C
index 7a18b2a080..cb78724ffe 100644
--- 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 8d92cc94d1..3523c99408 100644
--- 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 41baaa5f22..34da2fb3e4 100644
--- 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 020dbc097f..1686af99a8 100644
--- 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 0143d30fcd..b29397da05 100644
--- 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 ac60a70f06..0d35533166 100644
--- 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()));
 }
 
 
-- 
2.39.5