From 4ca4854a631b67fe446a3f8351b48c5c7e2571b4 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Tue, 22 May 2018 21:28:18 +0200
Subject: [PATCH] Updated mainwindow to remove recipeingredient.

---
 gui/mainwindow.cpp | 2 +-
 gui/mainwindow.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 9f8c381..d7712ab 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -48,7 +48,7 @@ void MainWindow::setInstruction(Instruction instruction){
     ui->instructionsTextEdit->setHtml(QString::fromStdString(instruction.getHTML()));
 }
 
-void MainWindow::setIngredients(vector<RecipeIngredient> ingredients){
+void MainWindow::setIngredients(vector<Ingredient> ingredients){
 	this->ingredientModel.setIngredients(ingredients);
 }
 
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 70ab7be..1a1bdbb 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 
 #include "model/recipe/recipe.h"
-#include "model/recipe/ingredients/recipeingredientlistmodel.h"
+#include "model/recipe/ingredients/ingredientlistmodel.h"
 #include "gui/newrecipedialog.h"
 #include "gui/openrecipedialog.h"
 #include "utils/stringutils.h"
@@ -41,14 +41,14 @@ public:
 	private:
     Ui::MainWindow *ui;
 	RecipeDatabase *recipeDB;
-	RecipeIngredientListModel ingredientModel;
+	IngredientListModel ingredientModel;
 	TagListModel tagsListModel;
 	Recipe currentRecipe;
 
     //Hidden manipulation methods.
     void setRecipeName(string name);
     void setInstruction(Instruction instruction);
-    void setIngredients(vector<RecipeIngredient> ingredients);
+	void setIngredients(vector<Ingredient> ingredients);
 	void setImage(QImage img);
 	void setPrepTime(QTime prepTime);
 	void setCookTime(QTime cookTime);