From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Thu, 24 Aug 2006 19:43:06 +0000 (+0000)
Subject: clean up Abdel's cleanup
X-Git-Tag: 1.6.10~12693
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f7d81fbabf71f5bc3c6a472be78f9d78b59ccdcf;p=lyx.git

clean up Abdel's cleanup


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14836 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt3/QContentPane.C b/src/frontends/qt3/QContentPane.C
index 9fd5cdcaf2..6c62b5b5bf 100644
--- a/src/frontends/qt3/QContentPane.C
+++ b/src/frontends/qt3/QContentPane.C
@@ -344,8 +344,6 @@ void QContentPane::resizeEvent(QResizeEvent *)
 
 void QContentPane::paintEvent(QPaintEvent * e)
 {
-	BufferView * buffer_view_ = wa_->view().view();
-
 	if (!pixmap_.get()) {
 		pixmap_.reset(new QPixmap(width(), height()));
 		wa_->view().workArea()->resizeBufferView();
diff --git a/src/frontends/qt3/QWorkArea.C b/src/frontends/qt3/QWorkArea.C
index 94a925a33f..24d8a110b1 100644
--- a/src/frontends/qt3/QWorkArea.C
+++ b/src/frontends/qt3/QWorkArea.C
@@ -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;
 
diff --git a/src/frontends/qt3/lyx_gui.C b/src/frontends/qt3/lyx_gui.C
index 4ff2dfc0f1..4a95a40739 100644
--- a/src/frontends/qt3/lyx_gui.C
+++ b/src/frontends/qt3/lyx_gui.C
@@ -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"
diff --git a/src/frontends/qt3/qscreen.C b/src/frontends/qt3/qscreen.C
index 4ca1498eed..ef0dcded42 100644
--- a/src/frontends/qt3/qscreen.C
+++ b/src/frontends/qt3/qscreen.C
@@ -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"