Am Montag, 5. Juni 2006 17:04 schrieb Bennett Helm:

> Tested lyx-1.5svn with Qt3 on Mac. I could not get it to crash (where  
> previously it would crash regularly).

Very nice.

> (However, there seems to be   
> something wrong with lyx2lyx: I can't open any existing documents  
> because it says it cannot convert from the old file format. So my  
> testing was not very complete.)

Strange. It works here e.g. for the tutorial. Can you give the lyx2lyx 
error message from the console?

> I could not get the Qt4 frontend to compile:
> 
> In file included from Dialogs.C:54:
> QCitation.h:87:2: warning: "/*" within comment
> Dialogs.C: In member function  
> 'boost::shared_ptr<lyx::frontend::Dialog> Dialogs::build(const  
> std::string&)':
> Dialogs.C:281: error: reference to 'ControlRef' is ambiguous
> /Users/bennett/lyx/gcc-4.0/qt-mac-opensource-src-4.1.3-universal/// 
> include/QtGui/../../src/gui/kernel/qwindowdefs.h:85: error:  
> candidates are: typedef struct OpaqueControlRef* ControlRef

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?


Georg
Index: src/frontends/qt4/QRef.C
===================================================================
--- src/frontends/qt4/QRef.C	(Revision 14001)
+++ src/frontends/qt4/QRef.C	(Arbeitskopie)
@@ -35,7 +35,7 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlRef, QView<QRefDialog> > base_class;
+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 14001)
+++ src/frontends/qt4/QRef.h	(Arbeitskopie)
@@ -24,7 +24,7 @@ class QRefDialog;
 
 
 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 14001)
+++ src/frontends/qt4/Dialogs.C	(Arbeitskopie)
@@ -278,7 +278,7 @@ Dialogs::DialogPtr Dialogs::build(string
 		dialog->setView(new QPrint(*dialog));
 		dialog->bc().bp(new OkApplyCancelPolicy);
 	} else if (name == "ref") {
-		dialog->setController(new ControlRef(*dialog));
+		dialog->setController(new lyx::frontend::ControlRef(*dialog));
 		dialog->setView(new QRef(*dialog));
 		dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
 	} else if (name == "sendto") {

Reply via email to