Core: remove count_dives_with_*() functions

The simplified filter-widget doesn't present lists of existing values
with counts. Thus, a whole slew of count_dives_with_*() functions
can be removed.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

3 files changed, 0 insertions, 83 deletions

diff --git a/core/dive.c b/core/dive.c
index 30a552a33..49431bffe 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -3357,70 +3357,6 @@ void dump_taglist(const char *intro, struct tag_entry *tl)
 	fprintf(stderr, "\n");
 }
 
-// count the dives where the tag list contains the given tag
-int count_dives_with_tag(const char *tag)
-{
-	int i, counter = 0;
-	struct dive *d;
-
-	for_each_dive (i, d) {
-		if (empty_string(tag)) {
-			// count dives with no tags
-			if (d->tag_list == NULL)
-				counter++;
-		} else if (taglist_contains(d->tag_list, tag)) {
-			counter++;
-		}
-	}
-	return counter;
-}
-
-extern bool string_sequence_contains(const char *string_sequence, const char *text);
-
-// count the dives where the person is included in the comma separated string sequences of buddies or divemasters
-int count_dives_with_person(const char *person)
-{
-	int i, counter = 0;
-	struct dive *d;
-
-	for_each_dive (i, d) {
-		if (empty_string(person)) {
-			// solo dive
-			if (empty_string(d->buddy) && empty_string(d->divemaster))
-				counter++;
-		} else if (string_sequence_contains(d->buddy, person) || string_sequence_contains(d->divemaster, person)) {
-			counter++;
-		}
-	}
-	return counter;
-}
-
-// count the dives with exactly the location
-int count_dives_with_location(const char *location)
-{
-	int i, counter = 0;
-	struct dive *d;
-
-	for_each_dive (i, d) {
-		if (same_string(get_dive_location(d), location))
-			counter++;
-	}
-	return counter;
-}
-
-// count the dives with exactly the suit
-int count_dives_with_suit(const char *suit)
-{
-	int i, counter = 0;
-	struct dive *d;
-
-	for_each_dive (i, d) {
-		if (same_string(d->suit, suit))
-			counter++;
-	}
-	return counter;
-}
-
 /*
  * Merging two dives can be subtle, because there's two different ways
  * of merging:
diff --git a/core/dive.h b/core/dive.h
index b4e7085b1..d544bc9d1 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -227,12 +227,7 @@ void taglist_cleanup(struct tag_entry **tag_list);
 
 void taglist_init_global();
 void taglist_free(struct tag_entry *tag_list);
-
 bool taglist_contains(struct tag_entry *tag_list, const char *tag);
-int count_dives_with_tag(const char *tag);
-int count_dives_with_person(const char *person);
-int count_dives_with_location(const char *location);
-int count_dives_with_suit(const char *suit);
 
 struct extra_data {
 	const char *key;
diff --git a/core/qthelper.cpp b/core/qthelper.cpp
index 8fbaa31af..d47a39fdf 100644
--- a/core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -362,20 +362,6 @@ extern "C" void copy_image_and_overwrite(const char *cfileName, const char *path
 		qDebug() << "copy of" << fileName << "to" << newName << "failed";
 }
 
-extern "C" bool string_sequence_contains(const char *string_sequence, const char *text)
-{
-	if (empty_string(text) || empty_string(string_sequence))
-		return false;
-
-	QString stringSequence(string_sequence);
-	QStringList strings = stringSequence.split(",", QString::SkipEmptyParts);
-	Q_FOREACH (const QString& string, strings) {
-		if (string.trimmed().compare(QString(text).trimmed(), Qt::CaseInsensitive) == 0)
-			return true;
-	}
-	return false;
-}
-
 static bool lessThan(const QPair<QString, int> &a, const QPair<QString, int> &b)
 {
 	return a.second < b.second;