[PATCH] CT 22

[Michael Gerz]

Some code refactoring. Not really worth mentioning...

Michael

Log:
Paragraph::insertChar(...): pass boolean trackChanges (rather than
Change), where possible

Modified:
   lyx-devel/branches/personal/gerz/change-tracking/src/buffer.C
   lyx-devel/branches/personal/gerz/change-tracking/src/insets/insettext.C
   lyx-devel/branches/personal/gerz/change-tracking/src/paragraph.C
   lyx-devel/branches/personal/gerz/change-tracking/src/paragraph.h





Index: paragraph.h
===================================================================
--- paragraph.h	(Revision 14001)
+++ paragraph.h	(Arbeitskopie)
@@ -301,9 +301,12 @@
 	void insert(lyx::pos_type pos, std::string const & str,
 		LyXFont const & font, Change const & change);
 	///
-	void insertChar(lyx::pos_type pos, value_type c, Change const & change);
+	void insertChar(lyx::pos_type pos, value_type c, bool trackChanges);
 	///
 	void insertChar(lyx::pos_type pos, value_type c,
+		LyXFont const &, bool trackChanges);
+	///
+	void insertChar(lyx::pos_type pos, value_type c,
 		LyXFont const &, Change const & change);
 	///
 	void insertInset(lyx::pos_type pos, InsetBase * inset,
Index: insets/insettext.C
===================================================================
--- insets/insettext.C	(Revision 14001)
+++ insets/insettext.C	(Arbeitskopie)
@@ -353,8 +353,7 @@
 	clear();
 	Paragraph & first = paragraphs().front();
 	for (unsigned int i = 0; i < data.length(); ++i)
-		first.insertChar(i, data[i], font,
-				 Change(trackChanges ? Change::INSERTED : Change::UNCHANGED));
+		first.insertChar(i, data[i], font, trackChanges);
 }
 
 
Index: buffer.C
===================================================================
--- buffer.C	(Revision 14001)
+++ buffer.C	(Arbeitskopie)
@@ -521,15 +521,12 @@
 		} else if (*cit == '\t') {
 			if (!par.isFreeSpacing()) {
 				// tabs are like spaces here
-				par.insertChar(pos, ' ', font, Change(params().tracking_changes ?
-				               Change::INSERTED : Change::UNCHANGED));
+				par.insertChar(pos, ' ', font, params().tracking_changes);
 				++pos;
 			} else {
 				const pos_type n = 8 - pos % 8;
 				for (pos_type i = 0; i < n; ++i) {
-					par.insertChar(pos, ' ', font,
-					      Change(params().tracking_changes ?
- 					             Change::INSERTED : Change::UNCHANGED));
+					par.insertChar(pos, ' ', font, params().tracking_changes);
 					++pos;
 				}
 			}
@@ -539,8 +536,7 @@
 			continue;
 		} else {
 			// just insert the character
-			par.insertChar(pos, *cit, font, Change(params().tracking_changes ?
-			                                 Change::INSERTED : Change::UNCHANGED));
+			par.insertChar(pos, *cit, font, params().tracking_changes);
 			++pos;
 			space_inserted = (*cit == ' ');
 		}
Index: paragraph.C
===================================================================
--- paragraph.C	(Revision 14001)
+++ paragraph.C	(Arbeitskopie)
@@ -259,13 +259,23 @@
 
 
 void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
-			   Change const & change)
+                           bool trackChanges)
 {
-	pimpl_->insertChar(pos, c, change);
+	pimpl_->insertChar(pos, c, Change(trackChanges ?
+	                   Change::INSERTED : Change::UNCHANGED));
 }
 
 
 void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+			   LyXFont const & font, bool trackChanges)
+{
+	pimpl_->insertChar(pos, c, Change(trackChanges ?
+                           Change::INSERTED : Change::UNCHANGED));
+	setFont(pos, font);
+}
+
+
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
 			   LyXFont const & font, Change const & change)
 {
 	pimpl_->insertChar(pos, c, change);