From: Richard Heck <rgheck@comcast.net>
Date: Wed, 9 Jun 2010 21:02:47 +0000 (+0000)
Subject: More minor cleanup, while looking for...
X-Git-Tag: 2.0.0~3146
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ae2f97994728153c15f26243abe42052bd70ad6d;p=features.git

More minor cleanup, while looking for...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34640 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 9faead6ef5..71c6c5b8fd 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -208,8 +208,9 @@ public:
 	TextContainer text_;
 	
 	typedef set<docstring> Words;
+	typedef map<Language, Words> LangWordsMap;
 	///
-	map<Language, Words> words_;
+	LangWordsMap words_;
 	///
 	Layout const * layout_;
 };
@@ -3072,8 +3073,8 @@ bool Paragraph::isSeparator(pos_type pos) const
 
 void Paragraph::deregisterWords()
 {
-	map<Language, Private::Words>::const_iterator itl = d->words_.begin();
-	map<Language, Private::Words>::const_iterator ite = d->words_.end();
+	Private::LangWordsMap::const_iterator itl = d->words_.begin();
+	Private::LangWordsMap::const_iterator ite = d->words_.end();
 	for (; itl != ite; ++itl) {
 		WordList * wl = theWordList(itl->first);
 		Private::Words::const_iterator it = (itl->second).begin();
@@ -3144,11 +3145,13 @@ void Paragraph::collectWords()
 
 void Paragraph::registerWords()
 {
-	map<Language, Private::Words>::const_iterator itl;
-	Private::Words::const_iterator it;
-	for (itl = d->words_.begin(); itl != d->words_.end(); ++itl) {
+	Private::LangWordsMap::const_iterator itl = d->words_.begin();
+	Private::LangWordsMap::const_iterator ite = d->words_.end();
+	for (; itl != ite; ++itl) {
 		WordList * wl = theWordList(itl->first);
-		for (it = (itl->second).begin(); it != (itl->second).end(); ++it)
+		Private::Words::const_iterator it = (itl->second).begin();
+		Private::Words::const_iterator et = (itl->second).end();
+		for (; it != et; ++it)
 			wl->insert(*it);
 	}
 }