From eb28793c05431eef16966945428b0668498fafa4 Mon Sep 17 00:00:00 2001 From: John Levon Date: Mon, 22 Jul 2002 16:05:17 +0000 Subject: [PATCH] remove LFUN_TOOLBAR_PUSH git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4744 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/LyXAction.C | 1 - src/commandtags.h | 1 - src/frontends/ChangeLog | 5 +++++ src/frontends/Toolbar.C | 6 ------ src/frontends/Toolbar.h | 2 -- src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/TODO | 1 - src/frontends/qt2/Toolbar_pimpl.C | 16 ---------------- src/frontends/qt2/Toolbar_pimpl.h | 2 -- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/Toolbar_pimpl.C | 14 -------------- src/frontends/xforms/Toolbar_pimpl.h | 2 -- src/lyxfunc.C | 12 ------------ src/trans.h | 15 +++++++++++---- 15 files changed, 32 insertions(+), 61 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 56b9ae453d..d44829cada 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-07-22 John Levon + + * LyXAction.C: + * commandtags.h: + * lyxfunc.C: remove LFUN_TOOLBAR_PUSH + 2002-07-22 Herbert Voss * lengthcommon.C: diff --git a/src/LyXAction.C b/src/LyXAction.C index acfaee94c5..ae4e14e908 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -383,7 +383,6 @@ void LyXAction::init() N_("Toggle cursor does/doesn't follow the scrollbar"), ReadOnly }, { LFUN_ADD_TO_TOOLBAR, "toolbar-add-to", "", NoBuffer }, - { LFUN_PUSH_TOOLBAR, "toolbar-push", "", NoBuffer }, { LFUN_UNDO, "undo", N_("Undo"), Noop }, { LFUN_UP, "up", "", ReadOnly }, { LFUN_UPSEL, "up-select", "", ReadOnly }, diff --git a/src/commandtags.h b/src/commandtags.h index f351161bbe..9a1f75175e 100644 --- a/src/commandtags.h +++ b/src/commandtags.h @@ -175,7 +175,6 @@ enum kb_action { LFUN_CAPITALIZE_WORD, LFUN_INSERT_LABEL, LFUN_REF_INSERT, - LFUN_PUSH_TOOLBAR, LFUN_ADD_TO_TOOLBAR, LFUN_DEPTH_MIN, // 150 // RVDK_PATCH_5 LFUN_DEPTH_PLUS, // RVDK_PATCH_5 diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 7fa1599c48..e2cbb5afbd 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,8 @@ +2002-07-22 John Levon + + * Toolbar.h: + * Toolbar.C: remove ->push() + 2002-07-21 Jean-Marc Lasgouttes * LyXView.C: use BufferParams::getLyXTextClass diff --git a/src/frontends/Toolbar.C b/src/frontends/Toolbar.C index fa2d0e5a4c..e105311042 100644 --- a/src/frontends/Toolbar.C +++ b/src/frontends/Toolbar.C @@ -92,12 +92,6 @@ void Toolbar::clearLayoutList() } -void Toolbar::push(int nth) -{ - pimpl_->push(nth); -} - - void Toolbar::add(string const & func, bool doclean) { int const tf = lyxaction.LookupFunc(func); diff --git a/src/frontends/Toolbar.h b/src/frontends/Toolbar.h index ba08defd0a..7fe691d0e1 100644 --- a/src/frontends/Toolbar.h +++ b/src/frontends/Toolbar.h @@ -46,8 +46,6 @@ public: void add(int , bool doclean = true); /// name of func instead of kb_action void add(string const & , bool doclean = true); - /// invokes the n'th icon in the toolbar - void push(int); /// update the state of the icons void update(); diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 8335dc4710..1f7bdcacb2 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2002-07-22 John Levon + + * Toolbar_pimpl.h: + * Toolbar_pimpl.C: remove ->push() + 2002-07-22 Edwin Leuven * QCitationDialog.C: fix loop search and info update after selecting diff --git a/src/frontends/qt2/TODO b/src/frontends/qt2/TODO index 0069c95277..80184b6821 100644 --- a/src/frontends/qt2/TODO +++ b/src/frontends/qt2/TODO @@ -110,4 +110,3 @@ Toolbar_pimpl - mathed symbols (*) - set() ?? - - push() ?? diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index 253c96c1b4..d7a855d2ce 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -269,19 +269,3 @@ void Toolbar::Pimpl::add(int action, bool) } } } - - -void Toolbar::Pimpl::push(int) -{ -#if 0 - lyxerr[Debug::GUI] << "Toolbar::push: trying to trigger no `" - << nth << '\'' << endl; - - if (nth <= 0 || nth >= int(toollist.size())) { - // item nth not found... - return; - } - - fl_trigger_object(toollist[nth - 1].icon); -#endif -} diff --git a/src/frontends/qt2/Toolbar_pimpl.h b/src/frontends/qt2/Toolbar_pimpl.h index 974b37b772..1598157ff1 100644 --- a/src/frontends/qt2/Toolbar_pimpl.h +++ b/src/frontends/qt2/Toolbar_pimpl.h @@ -52,8 +52,6 @@ public: void edit(); /// add a new button to the toolbar. void add(int, bool doclean = true); - /// invokes the n'th icon in the toolbar - void push(int); /// update the state of the icons void update(); diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index a814b06b22..12cab17920 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-07-22 John Levon + + * Toolbar_pimpl.h: + * Toolbar_pimpl.C: remove ->push() + 2002-07-22 Herbert Voss * FormGraphics.C: add tooltips, changesize_type to size_kind. diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C index b20d8aaac0..c00c5d2313 100644 --- a/src/frontends/xforms/Toolbar_pimpl.C +++ b/src/frontends/xforms/Toolbar_pimpl.C @@ -430,20 +430,6 @@ void Toolbar::Pimpl::clean() } -void Toolbar::Pimpl::push(int nth) -{ - lyxerr[Debug::GUI] << "Toolbar::push: trying to trigger no `" - << nth << '\'' << endl; - - if (nth <= 0 || nth >= int(toollist.size())) { - // item nth not found... - return; - } - - fl_trigger_object(toollist[nth - 1].icon); -} - - void Toolbar::Pimpl::reset() { //toollist = 0; // what is this supposed to do? diff --git a/src/frontends/xforms/Toolbar_pimpl.h b/src/frontends/xforms/Toolbar_pimpl.h index e6acdca1d3..348a1c2762 100644 --- a/src/frontends/xforms/Toolbar_pimpl.h +++ b/src/frontends/xforms/Toolbar_pimpl.h @@ -45,8 +45,6 @@ public: void edit(); /// add a new button to the toolbar. void add(int, bool doclean = true); - /// invokes the n'th icon in the toolbar - void push(int); /// update the state of the icons void update(); diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 8fe242caae..c101311fc1 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -1329,18 +1329,6 @@ void LyXFunc::dispatch(kb_action action, string argument, bool verbose) } break; - // --- toolbar ---------------------------------- - case LFUN_PUSH_TOOLBAR: - { - int nth = strToInt(argument); - if (nth <= 0) { - setErrorMessage(N_("Push-toolbar needs argument > 0")); - } else { - owner->getToolbar()->push(nth); - } - } - break; - case LFUN_ADD_TO_TOOLBAR: { if (lyxerr.debugging(Debug::GUI)) { diff --git a/src/trans.h b/src/trans.h index e0ccbc08ba..3d719c255b 100644 --- a/src/trans.h +++ b/src/trans.h @@ -1,6 +1,14 @@ // -*- C++ -*- -#ifndef Trans_h -#define Trans_h +/** + * \file trans.h + * Copyright 2002 the LyX Team + * Read the file COPYING + * + * \author unknown + */ + +#ifndef TRANS_H +#define TRANS_H #ifdef __GNUG__ #pragma interface @@ -19,7 +27,6 @@ class TransManager; /** Trans: holds a .kmap file */ -//class Trans : public TransInterface { class Trans { public: /// @@ -75,4 +82,4 @@ string const & Trans::Match(unsigned char c) return dummy; } -#endif +#endif // TRANS_H -- 2.39.2