From 4c1baccc86cc8e3472fcd3cfba6c5acb4f4c9d1a Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Thu, 2 Jun 2011 17:59:49 +0300
Subject: [PATCH] * mu-msg-iter: remove offset/index, cosmetics

---
 src/mu-msg-iter.cc | 56 +++++++++++++++++-----------------------------
 src/mu-msg-iter.h  | 13 -----------
 2 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/src/mu-msg-iter.cc b/src/mu-msg-iter.cc
index 1daa76f4..e239599f 100644
--- a/src/mu-msg-iter.cc
+++ b/src/mu-msg-iter.cc
@@ -31,29 +31,27 @@
 static gboolean update_msg (MuMsgIter *iter);
 
 struct _MuMsgIter {
-
-		_MuMsgIter (const Xapian::Enquire &enq, size_t maxnum):
-			_enq(enq), _maxnum(maxnum), _offset(0), _msg(0) {
-			
-			_matches = _enq.get_mset (0, _maxnum);
-			_cursor	 = _matches.begin();
-
-			if (!_matches.empty())
-				update_msg (this);
-		}
-
-		~_MuMsgIter () {
-			if (_msg)
-				mu_msg_unref (_msg);
-		}
+	_MuMsgIter (const Xapian::Enquire &enq, size_t maxnum):
+		_enq(enq), _msg(0) {
+		
+		_matches = _enq.get_mset (0, maxnum);
+		_cursor	 = _matches.begin();
+		
+		if (!_matches.empty())
+			update_msg (this);
+	}
 	
-		const Xapian::Enquire          _enq;
-		Xapian::MSet                   _matches;
-		Xapian::MSet::const_iterator   _cursor;
-		size_t                         _maxnum, _offset;
-
-		Xapian::Document _doc;
-		MuMsg *_msg;
+	~_MuMsgIter () {
+		if (_msg)
+			mu_msg_unref (_msg);
+	}
+	
+	const Xapian::Enquire          _enq;
+	Xapian::MSet                   _matches;
+	Xapian::MSet::const_iterator   _cursor;
+	
+	Xapian::Document _doc;
+	MuMsg *_msg;
 };
 
 
@@ -136,7 +134,6 @@ mu_msg_iter_next (MuMsgIter *iter)
 	
 	try {
 		++iter->_cursor;
-		++iter->_offset;
 
 		if (mu_msg_iter_is_done(iter))
 			return FALSE; /* no more matches */
@@ -187,9 +184,6 @@ mu_msg_iter_get_field (MuMsgIter *iter, MuMsgFieldId mfid)
 	return get_field (iter, mfid);
 }
 
-
-
-
 static gint64
 get_field_numeric (MuMsgIter *iter, MuMsgFieldId mfid)
 {
@@ -206,16 +200,6 @@ mu_msg_iter_get_field_numeric (MuMsgIter *iter, MuMsgFieldId mfid)
 	return get_field_numeric (iter, mfid);
 }
 
-
-unsigned int
-mu_msg_iter_get_index (MuMsgIter *iter)
-{
-	g_return_val_if_fail (iter, (unsigned int)-1);
-
-	return iter->_offset;
-}
-
-
 /* hmmm.... is it impossible to get a 0 docid, or just very improbable? */
 unsigned int
 mu_msg_iter_get_docid (MuMsgIter *iter)
diff --git a/src/mu-msg-iter.h b/src/mu-msg-iter.h
index 5cc25485..42098f8c 100644
--- a/src/mu-msg-iter.h
+++ b/src/mu-msg-iter.h
@@ -107,19 +107,6 @@ MuMsg* mu_msg_iter_get_msg (MuMsgIter *iter, GError **err)
 unsigned int     mu_msg_iter_get_docid         (MuMsgIter *iter);
 
 
-
-/**
- * get the index for this iterator (ie. somewhere between [0..n-1],
- * with being the number of matches, and increasing 1 for each
- * iter_next)
- * 
- * @param iter a valid MuMsgIter 
- * 
- * @return the index or (unsigned int)-1 in case of error
-
- */
-unsigned int      mu_msg_iter_get_index        (MuMsgIter *iter);
-
 /**
  * get some message field
  *