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

diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 53efbad427552c83d026bef0088210758c1f7d95..e5248d16b7d28191218a5d91a3a4284095d22d7c 100644 (file)
--- a/src/frontends/qt4/Dialogs.C
+++ b/src/frontends/qt4/Dialogs.C
@@ -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") {

diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C
index 79c50b3c72569f2b296fd72a47b46275b5168335..fbf1a61d9b997e2dd6b7c363830dd27c138300de 100644 (file)
--- a/src/frontends/qt4/QRef.C
+++ b/src/frontends/qt4/QRef.C
@@ -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)

diff --git a/src/frontends/qt4/QRef.h b/src/frontends/qt4/QRef.h
index 593728327ace15751ec6f9a5036ad290f9428b44..e9848ee2fcb2b3aa13850de6f1e7c8c8e4efad5f 100644 (file)
--- a/src/frontends/qt4/QRef.h
+++ b/src/frontends/qt4/QRef.h
@@ -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;