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

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0c8ed6c9a4000af8f48581a81c4b5c2f5b9fd502)

1 files changed, 63 insertions, 0 deletions

diff --git a/src/datablocks/ingredient.h b/src/datablocks/ingredient.h
new file mode 100644
index 0000000..bdc20d4
--- /dev/null
+++ b/src/datablocks/ingredient.h
@@ -0,0 +1,63 @@
+/***************************************************************************
+*   Copyright (C) 2003 by Unai Garro                                      *
+*   [email protected]                                          *
+*                                                                         *
+*   Copyright (C) 2006 Jason Kivlighn <[email protected]>               *
+*                                                                         *
+*   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.                                   *
+***************************************************************************/
+#ifndef INGREDIENT_H
+#define INGREDIENT_H
+
+#include <tqstring.h>
+#include <tqvaluelist.h>
+
+#include "datablocks/unit.h"
+#include "datablocks/elementlist.h"
+
+//###: Is there a better way to get the behavior of a list of Ingredient
+//     objects as a data member of Ingredient?
+class IngredientData
+{
+public:
+	IngredientData();
+	IngredientData( const TQString &name, double amount, const Unit &units, int unitID = -1, int ingredientID = -1 );
+
+	int ingredientID;
+	TQString name;
+	double amount;
+	double amount_offset;
+	Unit units;
+	int groupID;
+	TQString group;
+	ElementList prepMethodList;
+
+	/** Compare two elements by their id */
+	bool operator==( const IngredientData & ) const;
+};
+
+/**
+@author Unai Garro
+*/
+class Ingredient : public IngredientData
+{
+public:
+	Ingredient();
+	Ingredient( const TQString &name, double amount, const Unit &units, int unitID = -1, int ingredientID = -1 );
+	Ingredient( const IngredientData& );
+
+	TQValueList<IngredientData> substitutes;
+
+	void setAmount( const TQString &range, bool *ok = 0 );
+
+	/** Compare two elements by their id and groupID */
+	bool operator==( const Ingredient & ) const;
+
+	/** This is used for sorting, and so we compare by name */
+	bool operator<( const Ingredient & ) const;
+};
+
+#endif