core/tags/library: Remove library size() and {inc|dec}_size() functions

We can just access this variable directly instead.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

core/tags/library.cpp

@@ -40,21 +40,6 @@ void library :: write(file &file)
 	file_writef(&file, "%d %s", li_enabled, li_path.c_str());
 }
 
-const unsigned int library :: size()
-{
-	return li_size;
-}
-
-void library :: inc_size()
-{
-	li_size++;
-}
-
-void library :: dec_size()
-{
-	li_size--;
-}
-
 
 void library_db_init()
 {

core/tags/track.cpp

@@ -41,7 +41,7 @@ Track :: Track(struct album *album, struct artist *artist, struct genre *genre,
 	filter :: add(this->name(), index());
 	filter :: add(_artist->ar_name, index());
 	filter :: add(_album->al_name, index());
-	_library->inc_size();
+	_library->li_size++;
 }
 
 Track :: Track(const Track &track)
@@ -50,13 +50,13 @@ Track :: Track(const Track &track)
 	 _library(track._library), _count(track._count), _length(track._length),
 	 _track(track._track), _date(track._date), _path(track._path)
 {
-	_library->inc_size();
+	_library->li_size++;
 }
 
 Track :: ~Track()
 {
 	if (_library)
-		_library->dec_size();
+		_library->li_size--;
 }
 
 struct album   *Track :: album()   { return _album;   }
@@ -128,7 +128,7 @@ void Track :: read(file &file)
 	filter :: add(name(), index());
 	filter :: add(_artist->ar_name, index());
 	filter :: add(_album->al_name, index());
-	_library->inc_size();
+	_library->li_size++;
 }
 
 void Track :: write(file &file)

gui/manager.cpp

@@ -37,7 +37,7 @@ static void list_path(struct library *lib)
 		row = *(c_list->append());
 		row[c_cols.c_id]      = lib->index();
 		row[c_cols.c_enabled] = lib->li_enabled;
-		row[c_cols.c_size]    = lib->size();
+		row[c_cols.c_size]    = lib->li_size;
 		row[c_cols.c_path]    = lib->primary_key();
 	}
 }
@@ -82,7 +82,7 @@ void update_paths()
 	for (it = c_list->children().begin(); it != c_list->children().end(); it++) {
 		lib = library_get((*it)[c_cols.c_id]);
 		if (lib)
-			(*it)[c_cols.c_size] = lib->size();
+			(*it)[c_cols.c_size] = lib->li_size;
 	}
 }
 

include/core/tags/library.h

@@ -52,24 +52,6 @@ struct library : public DatabaseEntry {
 	 * @param  file  The file to write to.
 	 */
 	void write(file &);
-
-
-	/**
-	 * Called to access the number of tracks in this library.
-	 *
-	 * @return Library::_size.
-	 */
-	const unsigned int size();
-
-	/**
-	 * Used to increase Library::_size by 1.
-	 */
-	void inc_size();
-
-	/**
-	 * Used to decrease Library::_size by 1.
-	 */
-	void dec_size();
 };
 
 

tests/core/tags/library.cpp

@@ -8,21 +8,21 @@ static void test_verify_empty(struct library *library)
 {
 	test_equal(library->primary_key(), "");
 	test_equal(library->li_enabled, false);
-	test_equal(library->size(), 0);
+	test_equal(library->li_size, 0);
 }
 
 static void test_verify_zelda(struct library *library)
 {
 	test_equal(library->primary_key(), "/home/Zelda/Music");
 	test_equal(library->li_enabled, true);
-	test_equal(library->size(), 0);
+	test_equal(library->li_size, 0);
 }
 
 static void test_verify_link(struct library *library)
 {
 	test_equal(library->primary_key(), "/home/Link/Music");
 	test_equal(library->li_enabled, false);
-	test_equal(library->size(), 0);
+	test_equal(library->li_size, 0);
 }
 
 static void test_library()
@@ -37,14 +37,8 @@ static void test_library()
 	test_verify_zelda(zelda);
 	test_verify_empty(library);
 
-	for (unsigned int i = 0; i < 42; i++)
-		zelda->inc_size();
-	test_equal(zelda->size(), 42);
-
-	for (unsigned int i = 0; i < 21; i++)
-		zelda->dec_size();
-	test_equal(zelda->size(), 21);
-
+	link->li_size  = 21;
+	zelda->li_size = 42;
 
 	file_init(&f, "library_tag", 0);
 	file_open(&f, OPEN_WRITE);

tests/core/tags/track.cpp

@@ -56,7 +56,7 @@ static void verify_track_tag(Track *track, unsigned int size)
 	test_equal(track->track(),  (unsigned)13);
 	test_equal(track->length(), (unsigned)288);
 	test_equal(track->count(),  (unsigned)0);
-	test_equal(library->size(), size);
+	test_equal(library->li_size, size);
 }
 
 static void test_track_tag_constructor()
@@ -105,7 +105,7 @@ static void test_track_tag_constructor()
 
 static void test_track_tag_destructor()
 {
-	test_equal(library->size(), (unsigned)0);
+	test_equal(library->li_size, (unsigned)0);
 }
 
 static void test_track_tag_load_db(unsigned int size)
@@ -137,7 +137,7 @@ static void test_track_tag_lookup()
 			MUSIC_DIR + "/Hyrule Symphony/12 - Ocarina Medley.mp3",
 			"Ocarina Medley", 232, 12);
 	test_not_equal(b, a);
-	test_equal(library->size(), (unsigned)2);
+	test_equal(library->li_size, (unsigned)2);
 	test_equal(tags :: track_size(), b->index() + 1);
 
 
@@ -156,7 +156,7 @@ static void test_track_tag_lookup()
 	test_track_tag_load_db(2);
 	tags :: commit_track_db();
 	test_track_tag_load_db(1);
-	test_equal(library->size(), (unsigned)1);
+	test_equal(library->li_size, (unsigned)1);
 	test_equal(tags :: track_size(), b->index() + 1);
 
 
@@ -169,7 +169,7 @@ static void test_track_tag_lookup()
 
 	tags :: remove_library_tracks(library);
 	test_track_tag_load_db(0);
-	test_equal(library->size(), (unsigned)0);
+	test_equal(library->li_size, (unsigned)0);
 }
 
 static void test_track_tag_locale()