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 9fd5cdcaf2895aa6040f800d54513d68f991e741..6c62b5b5bffba2aa4072dcb1b94e4ba2e4ab836c 100644 (file)
--- 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 94a925a33f77f2a1ddc3c2b28e609eaad60e3eb7..24d8a110b1f7e416b314acb7e119216ab04c31e6 100644 (file)
--- 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 4ff2dfc0f11204917bca30475563736092283007..4a95a40739bb25992cfee732af56c37e030203af 100644 (file)
--- 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 4ca1498eed9d7f30c81f2eebdc1ed14944be567f..ef0dcded4274e91d3ad081a5610e21fb4482d32d 100644 (file)
--- 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"