From bbc02f6ada7c90fc9e788f201ddb8539e0900969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Mon, 26 Mar 2007 15:05:59 +0000 Subject: [PATCH] * src/frontends/controllers/ControlAboutlyx.[Ch]: * src/frontends/qt4/QAbout.C: - remove obsolete getLicense (which is identical to getDisclaimer) [bug 3371] git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17572 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ControlAboutlyx.C | 6 ------ src/frontends/controllers/ControlAboutlyx.h | 1 - src/frontends/qt4/QAbout.C | 2 -- 3 files changed, 9 deletions(-) diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C index 441f57feee..55053f3bee 100644 --- a/src/frontends/controllers/ControlAboutlyx.C +++ b/src/frontends/controllers/ControlAboutlyx.C @@ -68,12 +68,6 @@ string const ControlAboutlyx::getCopyright() const } -string const ControlAboutlyx::getLicense() const -{ - return lyx::to_utf8(_("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")); -} - - string const ControlAboutlyx::getDisclaimer() const { return lyx::to_utf8(_("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")); diff --git a/src/frontends/controllers/ControlAboutlyx.h b/src/frontends/controllers/ControlAboutlyx.h index 7cfa322b3a..a105c07868 100644 --- a/src/frontends/controllers/ControlAboutlyx.h +++ b/src/frontends/controllers/ControlAboutlyx.h @@ -37,7 +37,6 @@ public: /// Provide the View with specific pieces of information. void getCredits(std::ostream &) const; std::string const getCopyright() const; - std::string const getLicense() const; std::string const getDisclaimer() const; std::string const getVersion() const; //@} diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C index fc5e4bea88..b45c0a3a9f 100644 --- a/src/frontends/qt4/QAbout.C +++ b/src/frontends/qt4/QAbout.C @@ -54,8 +54,6 @@ void QAbout::build_dialog() dialog_->copyrightTB->setPlainText(toqstr(controller().getCopyright())); dialog_->copyrightTB->append("\n"); - dialog_->copyrightTB->append(toqstr(controller().getLicense())); - dialog_->copyrightTB->append("\n"); dialog_->copyrightTB->append(toqstr(controller().getDisclaimer())); dialog_->versionLA->setText(toqstr(controller().getVersion()));