From b26e3ab3bb2db30eb06b8bc6389346dfca34f32b Mon Sep 17 00:00:00 2001 From: John Levon Date: Mon, 22 Jul 2002 21:43:27 +0000 Subject: [PATCH] toolbar - remove dead code git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4753 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 8 ++++++++ src/frontends/qt2/QCommandBuffer.C | 1 + src/frontends/qt2/QtView.C | 1 - src/frontends/qt2/TODO | 1 - src/frontends/qt2/Toolbar_pimpl.C | 8 +------- src/frontends/qt2/Toolbar_pimpl.h | 15 +++------------ 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 2227423fdd..ec0385f89a 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,11 @@ +2002-07-22 John Levon + + * QCommandBuffer.C: probably compile fix + + * QtView.C: + * Toolbar_pimpl.h: + * Toolbar_pimpl.C: remove dead code + 2002-07-22 John Levon * lyx_gui.C: add exit() so we don't busy loop ! diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C index 173ddbb2bb..0e81854044 100644 --- a/src/frontends/qt2/QCommandBuffer.C +++ b/src/frontends/qt2/QCommandBuffer.C @@ -18,6 +18,7 @@ #include #include +#include #include namespace { diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C index 953757dc56..f1c6ea45b3 100644 --- a/src/frontends/qt2/QtView.C +++ b/src/frontends/qt2/QtView.C @@ -66,7 +66,6 @@ QtView::QtView(unsigned int width, unsigned int height) this, SLOT(activated(int))); toolbar_.reset(new Toolbar(this, *getDialogs(), 0, 0, toolbardefaults)); - toolbar_->set(true); statusBar()->setSizeGripEnabled(false); diff --git a/src/frontends/qt2/TODO b/src/frontends/qt2/TODO index 5b597c1428..42d3257c21 100644 --- a/src/frontends/qt2/TODO +++ b/src/frontends/qt2/TODO @@ -109,4 +109,3 @@ QtView Toolbar_pimpl - mathed symbols (*) - - set() ?? diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index d7a855d2ce..cdf023d770 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -224,13 +224,7 @@ void Toolbar::Pimpl::openLayoutList() } -void Toolbar::Pimpl::set(bool) -{ -// FIXME: ??? -} - - -void Toolbar::Pimpl::add(int action, bool) +void Toolbar::Pimpl::add(int action) { if (!toolbars_.size()) { toolbars_.push_back(new QToolBar(owner_)); diff --git a/src/frontends/qt2/Toolbar_pimpl.h b/src/frontends/qt2/Toolbar_pimpl.h index 1598157ff1..49b12c79f4 100644 --- a/src/frontends/qt2/Toolbar_pimpl.h +++ b/src/frontends/qt2/Toolbar_pimpl.h @@ -36,22 +36,13 @@ struct Toolbar::Pimpl { friend class ToolbarProxy; public: - /// Pimpl(LyXView * o, Dialogs &, int x, int y); - /// + ~Pimpl(); - /// (re)sets the toolbar - void set(bool doingmain = false); - - void reset() { } - - /** this is to be the entry point to the toolbar - frame, where you can change the toolbar realtime. - */ - void edit(); /// add a new button to the toolbar. - void add(int, bool doclean = true); + void add(int action); + /// update the state of the icons void update(); -- 2.39.2