From c99a986c16be4ca1812f7ba027db0b0ec98acb40 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 28 Jun 2006 13:23:39 +0000 Subject: [PATCH] header cleanups and removal of unused methods. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14258 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.C | 4 ++-- src/BufferView_pimpl.C | 16 ++-------------- src/BufferView_pimpl.h | 12 ------------ 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/BufferView.C b/src/BufferView.C index baad2b98d1..1c56e33867 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -214,7 +214,7 @@ void BufferView::center() string const BufferView::getClipboard() const { - return pimpl_->clipboard().get(); + return pimpl_->gui().clipboard().get(); } @@ -340,7 +340,7 @@ LyXText const * BufferView::getLyXText() const void BufferView::haveSelection(bool sel) { - pimpl_->clipboard().haveSelection(sel); + pimpl_->gui().clipboard().haveSelection(sel); } diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 709f702da6..7f7f4efaf3 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -319,18 +319,6 @@ lyx::frontend::Gui & BufferView::Pimpl::gui() const } -lyx::frontend::WorkArea & BufferView::Pimpl::workarea() const -{ - return *workArea_; -} - - -lyx::frontend::Clipboard & BufferView::Pimpl::clipboard() const -{ - return owner_->gui().clipboard(); -} - - lyx::frontend::Painter & BufferView::Pimpl::painter() const { return workArea_->getPainter(); @@ -638,7 +626,7 @@ void BufferView::Pimpl::selectionRequested() xsel_cache_.set = cur.selection(); sel = cur.selectionAsString(false); if (!sel.empty()) - clipboard().put(sel); + owner_->gui().clipboard().put(sel); } } @@ -886,7 +874,7 @@ void BufferView::Pimpl::center() void BufferView::Pimpl::stuffClipboard(string const & content) const { - clipboard().put(content); + owner_->gui().clipboard().put(content); } diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index c5c74862f8..b5b42d1970 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -22,20 +22,14 @@ #include "cursor.h" #include "errorlist.h" -#include "insets/inset.h" - -#include "frontends/key_state.h" #include "frontends/LyXKeySym.h" #include "frontends/Timeout.h" #include "support/types.h" -#include -#include #include class Change; -class LyXKeySym; class LyXView; class FuncRequest; @@ -46,9 +40,7 @@ namespace lyx { namespace frontend { class Gui; class WorkArea; -class Clipboard; class Painter; -class GuiCursor; } } @@ -121,10 +113,6 @@ public: /// the frontend lyx::frontend::Gui & gui() const; - /// our workarea - lyx::frontend::WorkArea & workarea() const; - /// the clipboard - lyx::frontend::Clipboard & clipboard() const; /// Width and height of the BufferView in Pixels /** -- 2.39.2