anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation fixes for qt3 after Abdel's latest changes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15292 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-10-09 16:08:27 +00:00
parent 05be07de9e
commit 41d7e4c394
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt3/Dialogs.C
View File

@ -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") {

2
src/frontends/qt3/QDialogView.C
View File

@ -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)
{}

10
src/frontends/qt3/QDialogView.h
View File

@ -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)
{}

2
src/frontends/qt3/QIndex.h
View File

@ -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:

2
src/frontends/qt3/QLToolbar.C
View File

@ -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));
}

2
src/frontends/qt3/QToc.C
View File

@ -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()));
}