core/reloader: do not require ShellRoot

Author: outfoxxed

src/core/generation.cpp

@@ -124,7 +124,10 @@ void EngineGeneration::onReload(EngineGeneration* old) {
 	QObject::connect(this->engine, &QQmlEngine::quit, this, &EngineGeneration::quit);
 	QObject::connect(this->engine, &QQmlEngine::exit, this, &EngineGeneration::exit);
 
-	this->root->reload(old == nullptr ? nullptr : old->root);
+	if (auto* reloadable = qobject_cast<Reloadable*>(this->root)) {
+		reloadable->reload(old ? old->root : nullptr);
+	}
+
 	this->singletonRegistry.onReload(old == nullptr ? nullptr : &old->singletonRegistry);
 	this->reloadComplete = true;
 	emit this->reloadFinished();

src/core/generation.hpp

@@ -13,7 +13,6 @@
 #include "incubator.hpp"
 #include "qsintercept.hpp"
 #include "scan.hpp"
-#include "shell.hpp"
 #include "singleton.hpp"
 
 class RootWrapper;
@@ -58,7 +57,7 @@ class EngineGeneration: public QObject {
 	QsUrlInterceptor urlInterceptor;
 	QsInterceptNetworkAccessManagerFactory interceptNetFactory;
 	QQmlEngine* engine = nullptr;
-	ShellRoot* root = nullptr;
+	QObject* root = nullptr;
 	SingletonRegistry singletonRegistry;
 	QFileSystemWatcher* watcher = nullptr;
 	QVector<QString> deletedWatchedFiles;

src/core/rootwrapper.cpp

@@ -14,7 +14,6 @@
 #include "generation.hpp"
 #include "qmlglobal.hpp"
 #include "scan.hpp"
-#include "shell.hpp"
 
 RootWrapper::RootWrapper(QString rootPath, QString shellId)
     : QObject(nullptr)
@@ -60,25 +59,11 @@ void RootWrapper::reloadGraph(bool hard) {
 	url.setScheme("qsintercept");
 	auto component = QQmlComponent(generation->engine, url);
 
-	auto* obj = component.beginCreate(generation->engine->rootContext());
+	auto* newRoot = component.beginCreate(generation->engine->rootContext());
 
-	if (obj == nullptr) {
-		const QString error = "failed to create root component\n" + component.errorString();
-		qWarning().noquote() << error;
-		generation->destroy();
-
-		if (this->generation != nullptr && this->generation->qsgInstance != nullptr) {
-			emit this->generation->qsgInstance->reloadFailed(error);
-		}
-
-		return;
-	}
-
-	auto* newRoot = qobject_cast<ShellRoot*>(obj);
 	if (newRoot == nullptr) {
-		const QString error = "root component was not a Quickshell.ShellRoot";
+		const QString error = "failed to create root component\n" + component.errorString();
 		qWarning().noquote() << error;
-		delete obj;
 		generation->destroy();
 
 		if (this->generation != nullptr && this->generation->qsgInstance != nullptr) {