Now the SetupModel is in MainWindow class and a pointer is

[emufront] / src / views / setupeditview.cpp

diff --git a/src/views/setupeditview.cpp b/src/views/setupeditview.cpp
index 80507f9..397d20c 100644 (file)
--- a/src/views/setupeditview.cpp
+++ b/src/views/setupeditview.cpp
@@ -1,22 +1,23 @@
-// EmuFront
-// Copyright 2010 Mikko Keinänen
-//
-// This file is part of EmuFront.
-//
-//
-// EmuFront is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation and appearing in the file gpl.txt included in the
-// packaging of this file.
-//
-// EmuFront is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
-
+/*
+** EmuFront
+** Copyright 2010 Mikko Keinänen
+**
+** This file is part of EmuFront.
+**
+**
+** EmuFront is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License version 2 as published by
+** the Free Software Foundation and appearing in the file gpl.txt included in the
+** packaging of this file.
+**
+** EmuFront is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include <QtGui>
 #include "setupeditview.h"
 #include "setupmodel.h"
@@ -26,10 +27,11 @@
 #include "mediatypemodel.h"
 #include <QSqlTableModel>
 
-SetupEditView::SetupEditView(QWidget *parent) :
-    EmuFrontEditView(parent)
+SetupEditView::SetupEditView(SetupModel *supModel, QWidget *parent) :
+    EmuFrontEditView(parent)//, model(supModel)
 {
-    model = new SetupModel(this);
+    model = supModel;
+    //model = new SetupModel(this);
     objectList->setModel(model);
     PlatformModel *plfModel = new PlatformModel(this);
     ComboBoxDelegate *platformDelegate = new ComboBoxDelegate(