Rearrange folders structure to remove unnecessary 'krecipes' second level subfolder

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0c8ed6c9a4000af8f48581a81c4b5c2f5b9fd502)

1 files changed, 272 insertions, 0 deletions

diff --git a/src/datablocks/ingredientlist.cpp b/src/datablocks/ingredientlist.cpp
new file mode 100644
index 0000000..7156a48
--- /dev/null
+++ b/src/datablocks/ingredientlist.cpp
@@ -0,0 +1,272 @@
+/***************************************************************************
+*   Copyright (C) 2003 by Unai Garro                                      *
+*                                                                         *
+*   Unai Garro (ugarro@users.sourceforge.net)                             *
+*   Cyril Bosselut (bosselut@b1project.com)                               *
+*   Jason Kivlighn (jkivlighn@gmail.com)                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+***************************************************************************/
+#include "ingredientlist.h"
+
+#include "backends/recipedb.h"
+
+IngredientList::IngredientList() : TQValueList<Ingredient>()
+{}
+
+IngredientList::~IngredientList()
+{}
+
+bool IngredientList::contains( const Ingredient &ing, bool compareAmount, RecipeDB *database ) const
+{
+	bool ret = false;
+	for ( IngredientList::const_iterator it = begin(); it != end(); ++it ) {
+		if ( (*it).ingredientID == ing.ingredientID ) {
+			//see if we have enough of the ingredient
+			//(only if an amount was specified for both)
+			if ( compareAmount && (*it).amount > 0 && ing.amount > 0 ) {
+				Ingredient convertedIng;
+				if ( database->convertIngredientUnits( ing, (*it).units, convertedIng ) )
+					ret = (*it).amount >= convertedIng.amount;
+				else //we couldn't do the conversion
+					ret = true;
+			}
+			else
+				ret = true;
+		}
+	}
+	if ( !ret ) {
+		for ( TQValueList<IngredientData>::const_iterator it = ing.substitutes.begin(); it != ing.substitutes.end(); ++it ) {
+			ret = contains(*it, compareAmount, database);
+			if ( ret ) break;
+		}
+	}
+	return ret;
+}
+
+bool IngredientList::containsSubSet( IngredientList &il, IngredientList &missing, bool compareAmount, RecipeDB *database )
+{
+	missing.empty();
+	bool contained = true;
+	IngredientList::const_iterator it;
+
+	for ( it = il.begin();it != il.end();++it ) {
+		if ( !contains( *it, compareAmount, database ) ) {
+			contained = false;
+			missing.append( *it );
+		}
+	}
+
+	return contained;
+}
+
+bool IngredientList::containsSubSet( IngredientList &il ) const
+{
+	IngredientList::const_iterator it;
+
+	for ( it = il.begin();it != il.end();++it ) {
+		if ( !contains( *it ) ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool IngredientList::containsAny( const IngredientList &list, bool compareAmount, RecipeDB *database )
+{
+	for ( IngredientList::const_iterator this_list_it = begin(); this_list_it != end(); ++this_list_it ) {
+		for ( IngredientList::const_iterator contains_list_it = list.begin(); contains_list_it != list.end(); ++contains_list_it ) {
+			if ( contains( *contains_list_it, compareAmount, database ) )
+				return true;
+		}
+	}
+
+	return false;
+}
+
+void IngredientList::empty( void )
+{
+	clear();
+}
+
+int IngredientList::find( int id ) const // Search by id (which uses search by item, with comparison defined on header)
+{
+	Ingredient i;
+	i.ingredientID = id;
+	return findIndex( i );
+}
+
+Ingredient IngredientList::findByName( const TQString &ing ) const
+{
+	IngredientList::const_iterator it_end = end();
+	for ( IngredientList::const_iterator it = begin(); it != it_end; ++it ) {
+		if ( ( *it ).name == ing )
+			return *it;
+
+		for ( TQValueList<IngredientData>::const_iterator sub_it = ( *it ).substitutes.begin(); sub_it != ( *it ).substitutes.end(); ++sub_it ) {
+			if ( ( *sub_it ).name == ing )
+				return *sub_it;
+		}
+	}
+
+	Ingredient el;
+	el.ingredientID = -1;
+	return el;
+}
+
+Ingredient IngredientList::findByName( const TQRegExp &rx ) const
+{
+	IngredientList::const_iterator it_end = end();
+	for ( IngredientList::const_iterator it = begin(); it != it_end; ++it ) {
+		if ( ( *it ).name.find(rx) != -1 )
+			return *it;
+
+		for ( TQValueList<IngredientData>::const_iterator sub_it = ( *it ).substitutes.begin(); sub_it != ( *it ).substitutes.end(); ++sub_it ) {
+			if ( ( *sub_it ).name.find(rx) != -1 )
+				return *sub_it;
+		}
+	}
+
+	Ingredient el;
+	el.ingredientID = -1;
+	return el;
+}
+
+IngredientList::const_iterator IngredientList::find( IngredientList::const_iterator it, int id ) const // Search by id (which uses search by item, with comparison defined on header)
+{
+	Ingredient i;
+	i.ingredientID = id;
+	return TQValueList<Ingredient>::find( it, i );
+}
+
+IngredientList::iterator IngredientList::find( IngredientList::iterator it, int id )  // Search by id (which uses search by item, with comparison defined on header)
+{
+	Ingredient i;
+	i.ingredientID = id;
+	return TQValueList<Ingredient>::find( it, i );
+}
+
+IngredientData& IngredientList::findSubstitute( const Ingredient &i )  // Search by id (which uses search by item, with comparison defined on header)
+{
+	TQValueList<Ingredient>::iterator result = TQValueList<Ingredient>::find(i);
+	if ( result == end() ) {
+		for ( IngredientList::iterator it = begin(); it != end(); ++it ) {
+			TQValueList<IngredientData>::iterator result = (*it).substitutes.find(i);
+			if ( result != (*it).substitutes.end() )
+				return *result;
+		}
+	}
+	return *result;
+}
+
+void IngredientList::removeSubstitute( const Ingredient &i )
+{
+	TQValueList<Ingredient>::iterator result = TQValueList<Ingredient>::find(i);
+	if ( result == end() ) {
+		for ( IngredientList::iterator it = begin(); it != end(); ++it ) {
+			TQValueList<IngredientData>::iterator result = (*it).substitutes.find(i);
+			if ( result != (*it).substitutes.end() ) {
+				(*it).substitutes.remove(result);
+				return;
+			}
+		}
+	}
+	remove(result);
+}
+
+void IngredientList::move( int index1, int index2 )  //moves element in pos index1, to pos after index2
+{
+	IngredientList::iterator tmp_it = at( index1 );
+	Ingredient tmp_ing( *tmp_it );
+
+	remove
+		( tmp_it );
+
+	tmp_it = at( index2 );
+	insert( tmp_it, tmp_ing );
+}
+
+void IngredientList::move( int index1, int count1, int index2 )  //moves element in pos index1 and the following count1 items, to pos after index2
+{
+	IngredientList::iterator tmp_it = at( index1 );
+	IngredientList::iterator after_it = at( index2 + 1 );
+
+	for ( int i = 0; i < count1; ++i )
+	{
+		Ingredient tmp_ing( *tmp_it );
+
+		IngredientList::iterator remove_me_it = tmp_it;
+		++tmp_it;
+		remove
+			( remove_me_it );
+
+		insert( after_it, tmp_ing );
+	}
+}
+
+IngredientList IngredientList::groupMembers( int id, IngredientList::const_iterator begin ) const
+{
+	bool first_found = false;
+
+	IngredientList matches;
+	for ( IngredientList::const_iterator it = begin; it != end(); ++it ) {
+		if ( ( *it ).groupID == id ) {
+			matches.append( *it );
+			first_found = true;
+		}
+		else if ( first_found )  //this is the end of this group... there may be more later though
+			break;
+	}
+
+	return matches;
+}
+
+TQValueList<IngredientList::const_iterator> IngredientList::_groupMembers( int id, IngredientList::const_iterator begin ) const
+{
+	bool first_found = false;
+
+	TQValueList<IngredientList::const_iterator> matches;
+	for ( IngredientList::const_iterator it = begin; it != end(); ++it ) {
+		if ( ( *it ).groupID == id ) {
+			matches << it;
+			first_found = true;
+		}
+		else if ( first_found )  //this is the end of this group... there may be more later though
+			break;
+	}
+
+	return matches;
+}
+
+IngredientList IngredientList::firstGroup()
+{
+	usedGroups.clear();
+
+	TQValueList<IngredientList::const_iterator> members = _groupMembers( ( *begin() ).groupID, begin() );
+
+	for ( TQValueList<IngredientList::const_iterator>::const_iterator members_it = members.begin(); members_it != members.end(); ++members_it ) {
+		usedGroups << *members_it;
+	}
+
+	return groupMembers( ( *begin() ).groupID, begin() );
+}
+
+IngredientList IngredientList::nextGroup()
+{
+	for ( IngredientList::const_iterator it = begin(); it != end(); ++it ) {
+		if ( usedGroups.find( it ) == usedGroups.end() ) {
+			TQValueList<IngredientList::const_iterator> members = _groupMembers( ( *it ).groupID, it );
+
+			for ( TQValueList<IngredientList::const_iterator>::const_iterator members_it = members.begin(); members_it != members.end(); ++members_it ) {
+				usedGroups << *members_it;
+			}
+
+			return groupMembers( ( *it ).groupID, it );
+		}
+	}
+	return IngredientList();
+}