From 9bee92a9e439e2bff9cc5b437803215c50ee5865 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 18 Jan 2023 15:58:37 -0600
Subject: [PATCH] using the classes in scopedpointers

---
 src/main.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5576d10..4b1f09a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,12 +38,13 @@
 
 #include "cpp/mpv/mpvobject.h"
 #include "cpp/serviceitemmodel.h"
+#include "cpp/slidemodel.h"
 #include "cpp/songsqlmodel.h"
 #include "cpp/videosqlmodel.h"
 #include "cpp/imagesqlmodel.h"
 #include "cpp/presentationsqlmodel.h"
 #include "cpp/filemanager.h"
-#include "cpp/slide.h"
+#include "cpp/slideobject.h"
 
 // RUST
 // #include "cxx-qt-gen/my_object.cxxqt.h"
@@ -131,9 +132,11 @@ int main(int argc, char *argv[])
   // setup of app specific commandline args
 
   //Need to instantiate our slide
-  QScopedPointer<Slide> slide(new Slide);
+  QScopedPointer<SlideModel> slideModel(new SlideModel);
+  QScopedPointer<SlideObject> slideobject(new SlideObject);
   QScopedPointer<File> filemanager(new File);
   QScopedPointer<QQuickView> preswin(new QQuickView);
+  QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel(slideModel.get()));
   preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
 
   // apparently mpv needs this class set
@@ -146,10 +149,11 @@ int main(int argc, char *argv[])
   qmlRegisterType<VideoSqlModel>("org.presenter", 1, 0, "VideoSqlModel");
   qmlRegisterType<ImageSqlModel>("org.presenter", 1, 0, "ImageSqlModel");
   qmlRegisterType<PresentationSqlModel>("org.presenter", 1, 0, "PresentationSqlModel");
-  qmlRegisterType<ServiceItemModel>("org.presenter", 1, 0, "ServiceItemModel");
   qmlRegisterType<FileHelper>("org.presenter", 1, 0, "FileHelper");
   qmlRegisterType<ServiceThing>("org.presenter", 1, 0, "ServiceThing");
-  qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slide.get());
+  qmlRegisterSingletonInstance("org.presenter", 1, 0,
+                               "ServiceItemModel", serviceItemModel.get());
+  qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slideobject.get());
   qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get());
   qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", preswin.get());