From: Georg Baum Date: Fri, 6 Apr 2007 08:48:34 +0000 (+0000) Subject: remove methods that are no longer needed since we have the new bibtex parser X-Git-Tag: 1.6.10~10327 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=10271ff52099206cd40e13cfc5486c80bb32fbfe;p=features.git remove methods that are no longer needed since we have the new bibtex parser git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17739 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C index 741a612710..f34b9023e7 100644 --- a/src/insets/insetcite.C +++ b/src/insets/insetcite.C @@ -340,9 +340,6 @@ docstring const InsetCitation::getScreenLabel(Buffer const & buffer) const return cache.screen_label; // The label has changed, so we have to re-create it. - string const before = getSecOptions(); - string const after = getOptions(); - docstring const glabel = generateLabel(buffer); unsigned int const maxLabelChars = 45; diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index c8788c946f..a691582ed7 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -60,12 +60,14 @@ public: InsetCommandParams const & params() const { return p_; } /// FIXME remove std::string const getContents() const { return p_.getContents(); } +protected: /// FIXME remove void setContents(std::string const & c) { updateButtonLabel_ = true; p_.setContents(c); } +public: /// void setParam(std::string const & name, docstring const & value) { @@ -79,10 +81,6 @@ public: } /// FIXME remove virtual void replaceContents(std::string const & from, std::string const & to); - /// FIXME remove - std::string const getOptions() const { return p_.getOptions(); } - /// FIXME remove - std::string const getSecOptions() const { return p_.getSecOptions(); } /// RenderButton & button() const { return button_; } /// @@ -104,18 +102,6 @@ protected: p_.setCmdName(n); } /// - void setOptions(std::string const & o) - { - updateButtonLabel_ = true; - p_.setOptions(o); - } - /// - void setSecOptions(std::string const & s) - { - updateButtonLabel_ = true; - p_.setSecOptions(s); - } - /// void setParams(InsetCommandParams const &); /// This should provide the text for the button virtual docstring const getScreenLabel(Buffer const &) const = 0; diff --git a/src/insets/insetcommandparams.h b/src/insets/insetcommandparams.h index ae6876ba83..0584020c5e 100644 --- a/src/insets/insetcommandparams.h +++ b/src/insets/insetcommandparams.h @@ -38,20 +38,24 @@ public: docstring const getCommand() const; /// Return the command name std::string const & getCmdName() const { return name_; } +private: /// FIXME remove std::string const getOptions() const; /// FIXME remove std::string const getSecOptions() const; +public: /// FIXME remove std::string const getContents() const; /// Set the name to \p n. This must be a known name. All parameters /// are cleared except those that exist also in the new command. /// What matters here is the parameter name, not position. void setCmdName(std::string const & n); +private: /// FIXME remove void setOptions(std::string const &); /// FIXME remove void setSecOptions(std::string const &); +public: /// FIXME remove void setContents(std::string const &); /// get parameter \p name