anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile fixes following Alfredo's setTitle changes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7006 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-05-22 18:14:36 +00:00
parent b12c42a381
commit a79813c242
13 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,23 @@
2003-05-22 Angus Leeming <leeming@lyx.org>
compile fixes.
* QDialogView.h: QController and QView c-tors take a string not a
QString.
* Qt2Base.h: ditto for the Qt2DB and Qt2CB c-tors.
* QDocument.C (c-tor):
* QPrefs.C (c-tor):
* QPrint.C (c-tor):
* QSearch.C (c-tor):
* QSendto.C (c-tor):
* QSpellchecker.C (c-tor):
* QTexinfo.C (c-tor): pass a string not a QString to the base class.
* QIndex.[Ch](c-tor): pass it a string, not a QString.
* Dialogs.C (build): the title passed to the Index dialog is a string,
not a QString.
2003-05-21 Alfredo Braunstein <abraunst@libero.it>
* Qt2Base.[Ch]:

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

@ -179,13 +179,13 @@ Dialog * Dialogs::build(string const & name)
} else if (name == "index") {
dialog->setController(new ControlCommand(*dialog, name));
dialog->setView(new QIndex(*dialog,
qt_("LyX: Index Entry"),
_("LyX: Index Entry"),
qt_("&Keyword")));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "label") {
dialog->setController(new ControlCommand(*dialog, name));
dialog->setView(new QIndex(*dialog,
qt_("LyX: Label"),
_("LyX: Label"),
qt_("&Label")));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "log") {

8
src/frontends/qt2/QDialogView.h
View File

@ -83,7 +83,7 @@ private:
template <class GUIDialog>
class QView: public QDialogView {
protected:
QView(Dialog &, QString const &);
QView(Dialog &, string const &);
/// update the dialog
virtual void update();
@ -101,7 +101,7 @@ protected:
template <class GUIDialog>
QView<GUIDialog>::QView(Dialog & p, QString const & t)
QView<GUIDialog>::QView(Dialog & p, string const & t)
: QDialogView(p, t)
{}
@ -149,7 +149,7 @@ class QController: public Base
{
protected:
///
QController(Dialog &, QString const &);
QController(Dialog &, string const &);
public:
/// The parent controller
Controller & controller();
@ -159,7 +159,7 @@ public:
template <class Controller, class Base>
QController<Controller, Base>::QController(Dialog & p, QString const & t)
QController<Controller, Base>::QController(Dialog & p, string const & t)
: Base(p, t)
{}

2
src/frontends/qt2/QDocument.C
View File

@ -52,7 +52,7 @@ typedef Qt2CB<ControlDocument, Qt2DB<QDocumentDialog> > base_class;
QDocument::QDocument()
: base_class(qt_("LyX: Document Settings"))
: base_class(_("LyX: Document Settings"))
{
vector<frnt::LanguagePair> const langs = frnt::getLanguageData(false);
lang_ = getSecond(langs);

2
src/frontends/qt2/QIndex.C
View File

@ -25,7 +25,7 @@
typedef QController<ControlCommand, QView<QIndexDialog> > base_class;
QIndex::QIndex(Dialog & parent, QString const & title, QString const & label)
QIndex::QIndex(Dialog & parent, string const & title, QString const & label)
: base_class(parent, title), label_(label)
{
}

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

@ -26,7 +26,7 @@ class QIndex :
public:
friend class QIndexDialog;
QIndex(Dialog &, QString const & title, QString const & label);
QIndex(Dialog &, string const & title, QString const & label);
protected:
virtual bool isValid();
private:

2
src/frontends/qt2/QPrefs.C
View File

@ -64,7 +64,7 @@ typedef Qt2CB<ControlPrefs, Qt2DB<QPrefsDialog> > base_class;
QPrefs::QPrefs()
: base_class(qt_("LyX: Preferences"))
: base_class(_("LyX: Preferences"))
{
}

2
src/frontends/qt2/QPrint.C
View File

@ -33,7 +33,7 @@ typedef Qt2CB<ControlPrint, Qt2DB<QLPrintDialog> > base_class;
QPrint::QPrint()
: base_class(qt_("LyX: Print Document"))
: base_class(_("LyX: Print Document"))
{
}

2
src/frontends/qt2/QSearch.C
View File

@ -28,7 +28,7 @@ typedef Qt2CB<ControlSearch, Qt2DB<QSearchDialog> > base_class;
QSearch::QSearch()
: base_class(qt_("LyX: Find and Replace"))
: base_class(_("LyX: Find and Replace"))
{
}

2
src/frontends/qt2/QSendto.C
View File

@ -31,7 +31,7 @@ typedef Qt2CB<ControlSendto, Qt2DB<QSendtoDialog> > base_class;
QSendto::QSendto()
: base_class(qt_("LyX: Send Document to Command"))
: base_class(_("LyX: Send Document to Command"))
{
}

2
src/frontends/qt2/QSpellchecker.C
View File

@ -29,7 +29,7 @@ typedef Qt2CB<ControlSpellchecker, Qt2DB<QSpellcheckerDialog> > base_class;
QSpellchecker::QSpellchecker()
: base_class(qt_("LyX: Spell-check Document"))
: base_class(_("LyX: Spell-check Document"))
{
}

2
src/frontends/qt2/QTexinfo.C
View File

@ -30,7 +30,7 @@ typedef Qt2CB<ControlTexinfo, Qt2DB<QTexinfoDialog> > base_class;
QTexinfo::QTexinfo()
: base_class(qt_("LyX: LaTeX Information")),
: base_class(_("LyX: LaTeX Information")),
warningPosted(false), activeStyle(ControlTexinfo::cls)
{
}

8
src/frontends/qt2/Qt2Base.h
View File

@ -79,7 +79,7 @@ private:
template <class Dialog>
class Qt2DB: public Qt2Base {
protected:
Qt2DB(QString const &);
Qt2DB(string const &);
/// update the dialog
virtual void update();
@ -97,7 +97,7 @@ protected:
template <class Dialog>
Qt2DB<Dialog>::Qt2DB(QString const & t)
Qt2DB<Dialog>::Qt2DB(string const & t)
: Qt2Base(t)
{}
@ -155,12 +155,12 @@ public:
protected:
///
Qt2CB(QString const &);
Qt2CB(string const &);
};
template <class Controller, class Base>
Qt2CB<Controller, Base>::Qt2CB(QString const & t)
Qt2CB<Controller, Base>::Qt2CB(string const & t)
: Base(t)
{}