From 35c0c230d7661da940992d741a544c69b61f827d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Tue, 7 Oct 2003 13:32:17 +0000 Subject: [PATCH] std::string fixes and small typo git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7871 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/aspell.C | 2 ++ src/aspell_local.h | 10 +++++----- src/support/ChangeLog | 4 ++++ src/support/Makefile.am | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 16ecf46cb1..2115e58c11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-10-07 Jürgen Spitzmüller + + * aspell.C: + * aspell_local.h: add forgotten std::string's. 2003-10-07 Martin Vermeer diff --git a/src/aspell.C b/src/aspell.C index 363b2fff8f..b0470339b7 100644 --- a/src/aspell.C +++ b/src/aspell.C @@ -22,6 +22,8 @@ #include +using std::string; + ASpell::ASpell(BufferParams const &, string const & lang) : els(0), spell_error_object(0) diff --git a/src/aspell_local.h b/src/aspell_local.h index 645b2cd6cb..f7e9414101 100644 --- a/src/aspell_local.h +++ b/src/aspell_local.h @@ -30,7 +30,7 @@ public: /** * Initialise the spellchecker with the given buffer params and language. */ - ASpell(BufferParams const & params, string const & lang); + ASpell(BufferParams const & params, std::string const & lang); virtual ~ASpell(); @@ -50,21 +50,21 @@ public: virtual void accept(WordLangTuple const &); /// return the next near miss after a MISSED result - virtual string const nextMiss(); + virtual std::string const nextMiss(); /// give an error message on messy exit - virtual string const error(); + virtual std::string const error(); private: /// add a speller of the given language - void addSpeller(string const & lang); + void addSpeller(std::string const & lang); struct Speller { AspellSpeller * speller; AspellConfig * config; }; - typedef std::map Spellers; + typedef std::map Spellers; /// the spellers Spellers spellers_; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index bb838f85d5..d89e3f3a00 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,7 @@ +2003-10-07 Jürgen Spitzmüller + + * Makefile.am: fix typo. + 2003-10-06 Lars Gullik Bjønnes * std_string.h: delete file diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 4c20426ca5..235d127016 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -27,7 +27,7 @@ libsupport_la_SOURCES = \ copy.C \ copied_ptr.h \ cow_ptr.h \ - debugstream,h \ + debugstream.h \ filename.C \ filename.h \ filetools.C \ -- 2.39.2