removing all of the legacy cpp code
This commit is contained in:
parent
6de638440f
commit
c3a61d51cf
26 changed files with 0 additions and 5943 deletions
48
src/main.cpp
48
src/main.cpp
|
@ -3,28 +3,19 @@
|
|||
#include <QtCore/qstringliteral.h>
|
||||
#include <QtQml>
|
||||
#include <QUrl>
|
||||
#include <QSql>
|
||||
#include <QDebug>
|
||||
#include <KLocalizedContext>
|
||||
#include <KLocalizedString>
|
||||
#include <KAboutData>
|
||||
// #include <KWindowSystem>
|
||||
#include <iostream>
|
||||
#include <QQmlEngine>
|
||||
// #include <QtSql>
|
||||
// #include <QSqlDatabase>
|
||||
// #include <QSqlTableModel>
|
||||
#include <QtWebEngineQuick>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtGlobal>
|
||||
#include <QOpenGLContext>
|
||||
#include <QGuiApplication>
|
||||
#include <QQuickStyle>
|
||||
#include <QSurfaceFormat>
|
||||
|
||||
// #include <QtGui/QOpenGLFramebufferObject>
|
||||
|
||||
#include <QtQuick/QQuickWindow>
|
||||
#include <QtQuick/QQuickView>
|
||||
#include <qapplication.h>
|
||||
|
@ -34,23 +25,12 @@
|
|||
#include <qguiapplication.h>
|
||||
#include <qqml.h>
|
||||
#include <qquickstyle.h>
|
||||
#include <qsqldatabase.h>
|
||||
#include <qsqlquery.h>
|
||||
#include <qstringliteral.h>
|
||||
// #include <MpvAbstractItem>
|
||||
// #include "cpp/mpv/mpvitem.h"
|
||||
// #include "cpp/mpv/mpvproperties.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/slidehelper.h"
|
||||
|
||||
// RUST
|
||||
// #include "cxx-qt-gen/service_thing.cxxqt.h"
|
||||
#include "cxx-qt-gen/file_helper.cxxqt.h"
|
||||
#include "cxx-qt-gen/slide_object.cxxqt.h"
|
||||
#include "cxx-qt-gen/slide_model.cxxqt.h"
|
||||
|
@ -116,13 +96,8 @@ int main(int argc, char *argv[])
|
|||
qDebug() << QApplication::platformName();
|
||||
|
||||
//Need to instantiate our slide
|
||||
// QScopedPointer<Utils> utils(new Utils);
|
||||
QScopedPointer<SlideModel> slideModel(new SlideModel);
|
||||
// QScopedPointer<SlideModelCpp> slideMod(new SlideModelCpp);
|
||||
// QScopedPointer<File> filemanager(new File);
|
||||
// QScopedPointer<QQuickView> preswin(new QQuickView);
|
||||
QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel);
|
||||
// QScopedPointer<ServiceItemModelCpp> serviceItemC(new ServiceItemModelCpp);
|
||||
QScopedPointer<SlideObject> slideobject(new SlideObject);
|
||||
QScopedPointer<ObsModel> obsModel(new ObsModel);
|
||||
obsModel.get()->getObs();
|
||||
|
@ -182,40 +157,23 @@ int main(int argc, char *argv[])
|
|||
qDebug() << serviceItemModel.get()->rowCount(QModelIndex());
|
||||
|
||||
//register our models
|
||||
// qmlRegisterType<SongProxyModel>("org.presenter", 1, 0, "SongProxyModel");
|
||||
// qmlRegisterType<VideoProxyModel>("org.presenter", 1, 0, "VideoProxyModel");
|
||||
// qmlRegisterType<ImageProxyModel>("org.presenter", 1, 0, "ImageProxyModel");
|
||||
// qmlRegisterType<PresentationProxyModel>("org.presenter", 1, 0, "PresentationProxyModel");
|
||||
qmlRegisterType<SongModel>("org.presenter", 1, 0, "SongModel");
|
||||
qmlRegisterType<SongEditor>("org.presenter", 1, 0, "SongEditor");
|
||||
qmlRegisterType<VideoModel>("org.presenter", 1, 0, "VideoModel");
|
||||
qmlRegisterType<ImageModel>("org.presenter", 1, 0, "ImageModel");
|
||||
qmlRegisterType<PresentationModel>("org.presenter", 1, 0, "PresentationModel");
|
||||
// qmlRegisterType<SongSqlModel>("org.presenter", 1, 0, "SongSqlModel");
|
||||
// qmlRegisterType<VideoSqlModel>("org.presenter", 1, 0, "VideoSqlModel");
|
||||
// qmlRegisterType<ImageSqlModel>("org.presenter", 1, 0, "ImageSqlModel");
|
||||
// qmlRegisterType<PresentationSqlModel>("org.presenter", 1, 0, "PresentationSqlModel");
|
||||
qmlRegisterType<FileHelper>("org.presenter", 1, 0, "FileHelper");
|
||||
qmlRegisterType<Ytdl>("org.presenter", 1, 0, "Ytdl");
|
||||
// qmlRegisterType<ServiceThing>("org.presenter", 1, 0, "ServiceThing");
|
||||
// qmlRegisterType<SlideHelper>("org.presenter", 1, 0, "SlideHelper");
|
||||
// qmlRegisterType<MpvItem>("mpv", 1, 0, "MpvItem");
|
||||
// qmlRegisterSingletonInstance("mpv", 1, 0, "MpvProperties", MpvProperties::self());
|
||||
|
||||
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0,
|
||||
"ServiceItemModel", serviceItemModel.get());
|
||||
// qmlRegisterSingletonInstance("org.presenter", 1, 0,
|
||||
// "ServiceItemC", serviceItemC.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideModel", slideModel.get());
|
||||
// qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideMod", slideMod.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "Utils", utils);
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slideobject.get());
|
||||
// qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", PresWindow);
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "RSettings", settings);
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "ObsModel", obsModel.get());
|
||||
// qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", preswin.get());
|
||||
|
||||
// This is the same slideobject, however to enusre that the PresWindow can have it
|
||||
// we need to set it as a separate context so that it can change it's slides too.
|
||||
|
@ -224,8 +182,6 @@ int main(int argc, char *argv[])
|
|||
PresWindow->rootContext()->setContextProperty(QStringLiteral("SlideObj"), slideobject.get());
|
||||
PresWindow->setTitle(QStringLiteral("presentation-window"));
|
||||
|
||||
// connectToDatabase();
|
||||
|
||||
qDebug() << "Starting engine";
|
||||
QQmlApplicationEngine engine;
|
||||
qDebug() << app.allWindows();
|
||||
|
@ -233,13 +189,9 @@ int main(int argc, char *argv[])
|
|||
engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
|
||||
engine.load(QUrl(QStringLiteral("qrc:qml/main.qml")));
|
||||
qDebug() << "Engine loaded";
|
||||
// engine.load(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
|
||||
|
||||
qDebug() << app.topLevelWindows();
|
||||
qDebug() << app.allWindows();
|
||||
// QQuickView *view = new QQuickView;
|
||||
// view->setSource(QUrl(QStringLiteral("qrc:qml/main.qml")));
|
||||
// view->show();
|
||||
#ifdef STATIC_KIRIGAMI
|
||||
KirigamiPlugin::getInstance().registerTypes();
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue