Am Donnerstag, 24. August 2006 21:17 schrieb Abdelrazak Younes:
> Georg Baum wrote:
> > Abdel, this problem in trunk appeared after your last commit:
> > http://bugzilla.lyx.org/show_bug.cgi?id=2792
> > I see it, too (with gcc 3.3.5 and 4.1, external boost 1.34cvs). Any
idea
> > what goes wrong?
>
> Maybe a header include is missing, could you try to add this to
WorkArea.h:
>
> #include <boost/signal.hpp>
No, that is not the problem. I found it out now: It is again the pollution
of the global namespace in qt3 with the signals keyword. The attached
patch (including more cleanup) goes in now.
Georg
Index: src/frontends/qt3/lyx_gui.C
===================================================================
--- src/frontends/qt3/lyx_gui.C (Revision 14834)
+++ src/frontends/qt3/lyx_gui.C (Arbeitskopie)
@@ -39,6 +39,7 @@
#include <boost/signal.hpp> // FIXME: Is this needed? (Lgb)
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
+#include "frontends/WorkArea.h"
#include "GuiImplementation.h"
#include "QtView.h"
Index: src/frontends/qt3/qscreen.C
===================================================================
--- src/frontends/qt3/qscreen.C (Revision 14834)
+++ src/frontends/qt3/qscreen.C (Arbeitskopie)
@@ -10,8 +10,11 @@
#include <config.h>
-#include "QWorkArea.h"
+// Dear Lord, deliver us from Evil, aka the Qt headers
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
#include "qscreen.h"
+#include "QWorkArea.h"
#include "debug.h"
#include "lcolorcache.h"
Index: src/frontends/qt3/QWorkArea.C
===================================================================
--- src/frontends/qt3/QWorkArea.C (Revision 14834)
+++ src/frontends/qt3/QWorkArea.C (Arbeitskopie)
@@ -38,10 +38,6 @@
#include <Carbon/Carbon.h>
#endif
-#include <support/lstrings.h>
-
-using lyx::support::internalLineEnding;
-using lyx::support::externalLineEnding;
using std::endl;
using std::string;
Index: src/frontends/qt3/QContentPane.C
===================================================================
--- src/frontends/qt3/QContentPane.C (Revision 14834)
+++ src/frontends/qt3/QContentPane.C (Arbeitskopie)
@@ -344,8 +344,6 @@ void QContentPane::resizeEvent(QResizeEv
void QContentPane::paintEvent(QPaintEvent * e)
{
- BufferView * buffer_view_ = wa_->view().view();
-
if (!pixmap_.get()) {
pixmap_.reset(new QPixmap(width(), height()));
wa_->view().workArea()->resizeBufferView();
