mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
compile fix for OS X
* src/frontends/qt4/QRef.C: s/ControlRef/lyx::frontend::ControlRef/ * src/frontends/qt4/QRef.h: ditto * src/frontends/qt4/Dialogs.C: (Dialogs::build): ditto git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14020 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4401521a45
commit
56cd160c39
@ -278,7 +278,8 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
|
||||
dialog->setView(new QPrint(*dialog));
|
||||
dialog->bc().bp(new OkApplyCancelPolicy);
|
||||
} else if (name == "ref") {
|
||||
dialog->setController(new ControlRef(*dialog));
|
||||
// full qualification because qt4 has also a ControlRef type
|
||||
dialog->setController(new lyx::frontend::ControlRef(*dialog));
|
||||
dialog->setView(new QRef(*dialog));
|
||||
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
|
||||
} else if (name == "sendto") {
|
||||
|
@ -35,7 +35,8 @@ using std::string;
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
typedef QController<ControlRef, QView<QRefDialog> > base_class;
|
||||
// full qualification because qt4 has also a ControlRef type
|
||||
typedef QController<lyx::frontend::ControlRef, QView<QRefDialog> > base_class;
|
||||
|
||||
|
||||
QRef::QRef(Dialog & parent)
|
||||
|
@ -23,8 +23,9 @@ class ControlRef;
|
||||
class QRefDialog;
|
||||
|
||||
|
||||
// full qualification because qt4 has also a ControlRef type
|
||||
class QRef
|
||||
: public QController<ControlRef, QView<QRefDialog> >
|
||||
: public QController<lyx::frontend::ControlRef, QView<QRefDialog> >
|
||||
{
|
||||
public:
|
||||
friend class QRefDialog;
|
||||
|
Loading…
Reference in New Issue
Block a user