Abdelrazak Younes wrote:
> Bennett Helm wrote:
>>>
>>> This is in qt 1.4.2 too, but it seems that qwindowdefs.h is not included
>>> here.
>>>
>>> Does the attached patch resolve the compile problem?
>>
>> Yes; I'm finishing compiling now. (It's actually a problem we had
>> encountered this before, and Abdel, I believe, came up with the
>> following (temporary?) solution on Mac:
>
> Yes I remember that, that was a _long_ time ago in internet time... Sorry.
>
> Could you commit the fix Georg?
Done.
Log:
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
Index: src/frontends/qt4/QRef.C
===================================================================
--- src/frontends/qt4/QRef.C (Revision 14015)
+++ src/frontends/qt4/QRef.C (Arbeitskopie)
@@ -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)
Index: src/frontends/qt4/QRef.h
===================================================================
--- src/frontends/qt4/QRef.h (Revision 14015)
+++ src/frontends/qt4/QRef.h (Arbeitskopie)
@@ -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;
Index: src/frontends/qt4/Dialogs.C
===================================================================
--- src/frontends/qt4/Dialogs.C (Revision 14015)
+++ src/frontends/qt4/Dialogs.C (Arbeitskopie)
@@ -278,7 +278,8 @@ Dialogs::DialogPtr Dialogs::build(string
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") {
