clean up Abdel's cleanup

[lyx.git] / src / frontends / qt3 / QContentPane.C

diff --git a/src/frontends/qt3/QContentPane.C b/src/frontends/qt3/QContentPane.C
index fbd9362c946d280dd60d3859b71f40063a508a61..6c62b5b5bffba2aa4072dcb1b94e4ba2e4ab836c 100644 (file)
--- a/src/frontends/qt3/QContentPane.C
+++ b/src/frontends/qt3/QContentPane.C
@@ -12,6 +12,7 @@
 
 #include "BufferView.h"
 #include "frontends/LyXView.h"
+#include "frontends/WorkArea.h"
 
 // Qt defines a macro 'signals' that clashes with a boost namespace.
 // All is well if the namespace is visible first.
@@ -35,7 +36,7 @@ key_modifier::state q_key_state(Qt::ButtonState state)
                k |= key_modifier::ctrl;
        if (state & Qt::ShiftButton)
                k |= key_modifier::shift;
-       if (state & Qt::AltButton)
+       if (state & Qt::AltButton || state & Qt::MetaButton)
                k |= key_modifier::alt;
        return k;
 }
@@ -78,6 +79,9 @@ mouse_button::state q_motion_state(Qt::ButtonState state)
 } // namespace anon
 
 
+namespace lyx {
+namespace frontend {
+
 // This is a 'heartbeat' generating synthetic mouse move events when the
 // cursor is at the top or bottom edge of the viewport. One scroll per 0.2 s
 SyntheticMouseEvent::SyntheticMouseEvent()
@@ -158,7 +162,7 @@ void QContentPane::generateSyntheticMouseEvent()
                synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
 
                // ... and dispatch the event to the LyX core.
-                wa_->view().view()->workAreaDispatch(synthetic_mouse_event_.cmd);
+               wa_->view().workArea()->dispatch(synthetic_mouse_event_.cmd);
        }
 }
 
@@ -166,7 +170,7 @@ void QContentPane::generateSyntheticMouseEvent()
 void QContentPane::scrollBarChanged(int val)
 {
        if (track_scrollbar_)
-                wa_->view().view()->scrollDocView(val);
+               wa_->view().workArea()->scrollBufferView(val);
 }
 
 
@@ -177,13 +181,13 @@ void QContentPane::mousePressEvent(QMouseEvent * e)
                FuncRequest cmd(LFUN_MOUSE_TRIPLE,
                        dc_event_.x, dc_event_.y,
                        q_button_state(dc_event_.state));
-                wa_->view().view()->workAreaDispatch(cmd);
+               wa_->view().workArea()->dispatch(cmd);
                return;
        }
 
        FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
                              q_button_state(e->button()));
-        wa_->view().view()->workAreaDispatch(cmd);
+       wa_->view().workArea()->dispatch(cmd);
 }
 
 
@@ -194,7 +198,7 @@ void QContentPane::mouseReleaseEvent(QMouseEvent * e)
 
        FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
                              q_button_state(e->button()));
-        wa_->view().view()->workAreaDispatch(cmd);
+       wa_->view().workArea()->dispatch(cmd);
 }
 
 
@@ -254,7 +258,7 @@ void QContentPane::mouseMoveEvent(QMouseEvent * e)
                synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
 
                // ... and dispatch the event to the LyX core.
-                wa_->view().view()->workAreaDispatch(cmd);
+               wa_->view().workArea()->dispatch(cmd);
        }
 }
 
@@ -292,7 +296,7 @@ void QContentPane::keyeventTimeout()
        boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
                sym->set(ev.get());
 
-                wa_->view().view()->workAreaKeyPress(sym, q_key_state(ev->state()));
+               wa_->view().workArea()->processKeySym(sym, q_key_state(ev->state()));
                keyeventQueue_.pop();
 
                handle_autos = false;
@@ -313,7 +317,7 @@ void QContentPane::doubleClickTimeout()
        FuncRequest cmd(LFUN_MOUSE_DOUBLE,
                dc_event_.x, dc_event_.y,
                q_button_state(dc_event_.state));
-        wa_->view().view()->workAreaDispatch(cmd);
+       wa_->view().workArea()->dispatch(cmd);
 }
 
 
@@ -334,7 +338,7 @@ void QContentPane::resizeEvent(QResizeEvent *)
        }
 
        pixmap_->resize(width(), height());
-        wa_->view().view()->workAreaResize();
+       wa_->view().workArea()->resizeBufferView();
 }
 
 
@@ -342,7 +346,7 @@ void QContentPane::paintEvent(QPaintEvent * e)
 {
        if (!pixmap_.get()) {
                pixmap_.reset(new QPixmap(width(), height()));
-                wa_->view().view()->workAreaResize();
+               wa_->view().workArea()->resizeBufferView();
                return;
        }
 
@@ -358,3 +362,8 @@ void QContentPane::trackScrollbar(bool track_on)
 {
        track_scrollbar_ = track_on;
 }
+
+} // namespace frontend
+} // namespace lyx
+
+#include "QContentPane_moc.cpp"