From 56cd160c398beb78481d874e633e30c2b8ef213d Mon Sep 17 00:00:00 2001
From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Tue, 6 Jun 2006 10:10:11 +0000
Subject: [PATCH] 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
---
 src/frontends/qt4/Dialogs.C | 3 ++-
 src/frontends/qt4/QRef.C    | 3 ++-
 src/frontends/qt4/QRef.h    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 53efbad427..e5248d16b7 100644
--- 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 79c50b3c72..fbf1a61d9b 100644
--- 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 593728327a..e9848ee2fc 100644
--- 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;
-- 
2.39.2