add wasm support

Skycoder42 · Skycoder42 · commit bdeef06f952e · 2019-02-12T23:22:07.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,9 @@ matrix:
         - PLATFORM=gcc_64
         - BUILD_DOC=true
         - BUILD_EXAMPLES=true
+    - os: linux
+      env:
+        - PLATFORM=emscripten
     - os: linux
       env:
         - PLATFORM=android_arm64_v8a
diff --git a/examples/mvvmdatasynccore/DataSyncSampleCore/samplecoreapp.cpp b/examples/mvvmdatasynccore/DataSyncSampleCore/samplecoreapp.cpp
@@ -29,7 +29,7 @@ int SampleCoreApp::startApp(const QStringList &arguments)
 				.create();
 		show<SampleViewModel>();
 		return EXIT_SUCCESS;
-	} catch (QException &e) {
+	} catch (std::exception &e) {
 		qCritical() << e.what();
 		return EXIT_FAILURE;
 	}
diff --git a/src/imports/mvvmquick/settingsentrymodel.cpp b/src/imports/mvvmquick/settingsentrymodel.cpp
@@ -168,8 +168,7 @@ SettingsEntryModel::EntryInfo::EntryInfo(SettingsElements::Entry entry, QUrl del
 	group(std::move(group))
 {
 	static const QRegularExpression nameRegex(QStringLiteral("&(?!&)"),
-											  QRegularExpression::DontCaptureOption |
-											  QRegularExpression::OptimizeOnFirstUsageOption);
+											  QRegularExpression::DontCaptureOption);
 	title.remove(nameRegex);
 	this->group.entries.clear();
 }
diff --git a/src/mvvmcore/coreapp.cpp b/src/mvvmcore/coreapp.cpp
@@ -251,7 +251,7 @@ void CoreAppPrivate::showDialog(const MessageConfig &config, MessageResult *resu
 		try {
 			presenter->showDialog(config, result);
 			logDebug() << "Successfully presented dialog of type" << config.type();
-		} catch(QException &e) {
+		} catch(QTMVVM_EXCEPTION_BASE &e) {
 			logCritical() << "Failed to show dialog for type"
 						  << config.type() << ":" << config.subType()
 						  << "with error:"
@@ -368,7 +368,7 @@ QPointer<ViewModel> CoreAppPrivate::showViewModelWithReturn(const QMetaObject *m
 			if(isSingle)
 				singleInstances.insert(metaObject, vm);
 			return vm;
-		} catch(QException &e) {
+		} catch(QTMVVM_EXCEPTION_BASE &e) {
 			logCritical() << "Failed to present viewmodel of type"
 						  << metaObject->className()
 						  << "with error:"
diff --git a/src/mvvmcore/exception.h b/src/mvvmcore/exception.h
@@ -0,0 +1,16 @@
+#ifndef QTMVVM_EXCEPTION_H
+#define QTMVVM_EXCEPTION_H
+
+#include "QtMvvmCore/qtmvvmcore_global.h"
+
+#if !defined(QT_NO_EXCEPTIONS) && QT_CONFIG(future)
+#include <QtCore/QException>
+#define QTMVVM_EXCEPTION_BASE QException
+#define QTMVVM_EXCEPTION_OR override
+#else
+#include <exception>
+#define QTMVVM_EXCEPTION_BASE std::exception
+#define QTMVVM_EXCEPTION_OR
+#endif
+
+#endif // QTMVVM_EXCEPTION_H
diff --git a/src/mvvmcore/ipresenter.cpp b/src/mvvmcore/ipresenter.cpp
@@ -19,7 +19,7 @@ void PresenterException::raise() const
 	throw (*this);
 }
 
-QException *PresenterException::clone() const
+QTMVVM_EXCEPTION_BASE *PresenterException::clone() const
 {
 	return new PresenterException(this);
 }
diff --git a/src/mvvmcore/ipresenter.h b/src/mvvmcore/ipresenter.h
@@ -1,16 +1,15 @@
 #ifndef QTMVVM_IPRESENTER_H
 #define QTMVVM_IPRESENTER_H
 
-#include <QtCore/qexception.h>
-
 #include "QtMvvmCore/qtmvvmcore_global.h"
 #include "QtMvvmCore/viewmodel.h"
 #include "QtMvvmCore/message.h"
+#include "QtMvvmCore/exception.h"
 
 namespace QtMvvm {
 
 //! An exception to be thrown from the presenter if presenting fails
-class Q_MVVMCORE_EXPORT PresenterException : public QException
+class Q_MVVMCORE_EXPORT PresenterException : public QTMVVM_EXCEPTION_BASE
 {
 public:
 	//! Constructor with an error message
@@ -20,9 +19,9 @@ class Q_MVVMCORE_EXPORT PresenterException : public QException
 	const char *what() const noexcept override;
 
 	//! @inherit{QException::raise}
-	void raise() const override;
+	virtual void raise() const QTMVVM_EXCEPTION_OR;
 	//! @inherit{QException::clone}
-	QException *clone() const override;
+	virtual QTMVVM_EXCEPTION_BASE *clone() const QTMVVM_EXCEPTION_OR;
 
 protected:
 	//! @private
diff --git a/src/mvvmcore/mvvmcore.pro b/src/mvvmcore/mvvmcore.pro
@@ -25,7 +25,8 @@ HEADERS += \
 	isettingsaccessor.h \
 	qsettingsaccessor.h \
 	settingsentry.h \
-	settingsconfigloader_p.h
+	settingsconfigloader_p.h \
+    exception.h
 
 SOURCES += \
 	viewmodel.cpp \
diff --git a/src/mvvmcore/serviceregistry.cpp b/src/mvvmcore/serviceregistry.cpp
@@ -335,7 +335,7 @@ void ServiceExistsException::raise() const
 	throw (*this);
 }
 
-QException *ServiceExistsException::clone() const
+QTMVVM_EXCEPTION_BASE *ServiceExistsException::clone() const
 {
 	return new ServiceExistsException(this);
 }
@@ -360,7 +360,7 @@ void ServiceConstructionException::raise() const
 	throw (*this);
 }
 
-QException *ServiceConstructionException::clone() const
+QTMVVM_EXCEPTION_BASE *ServiceConstructionException::clone() const
 {
 	return new ServiceConstructionException(this);
 }
@@ -380,7 +380,7 @@ void ServiceDependencyException::raise() const
 	throw (*this);
 }
 
-QException *ServiceDependencyException::clone() const
+QTMVVM_EXCEPTION_BASE *ServiceDependencyException::clone() const
 {
 	return new ServiceDependencyException(this);
 }
diff --git a/src/mvvmcore/serviceregistry.h b/src/mvvmcore/serviceregistry.h
@@ -5,10 +5,10 @@
 
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/qexception.h>
 
 #include "QtMvvmCore/qtmvvmcore_global.h"
 #include "QtMvvmCore/injection.h"
+#include "QtMvvmCore/exception.h"
 
 namespace QtMvvm {
 
@@ -108,7 +108,7 @@ class Q_MVVMCORE_EXPORT ServiceRegistry //MAJOR make a QObject for invokable met
 };
 
 //! Is thrown if a service is beeing registered that is already registered
-class Q_MVVMCORE_EXPORT ServiceExistsException : public QException
+class Q_MVVMCORE_EXPORT ServiceExistsException : public QTMVVM_EXCEPTION_BASE
 {
 public:
 	//! @private
@@ -118,9 +118,9 @@ class Q_MVVMCORE_EXPORT ServiceExistsException : public QException
 	const char *what() const noexcept override;
 
 	//! @inherit{QException::raise}
-	void raise() const override;
+	virtual void raise() const QTMVVM_EXCEPTION_OR;
 	//! @inherit{QException::clone}
-	QException *clone() const override;
+	virtual QTMVVM_EXCEPTION_BASE *clone() const QTMVVM_EXCEPTION_OR;
 
 protected:
 	//! @private
@@ -131,7 +131,7 @@ class Q_MVVMCORE_EXPORT ServiceExistsException : public QException
 };
 
 //! Is thrown in case the construction of a service has failed
-class Q_MVVMCORE_EXPORT ServiceConstructionException : public QException
+class Q_MVVMCORE_EXPORT ServiceConstructionException : public QTMVVM_EXCEPTION_BASE
 {
 public:
 	//! @private
@@ -141,9 +141,9 @@ class Q_MVVMCORE_EXPORT ServiceConstructionException : public QException
 	const char *what() const noexcept override;
 
 	//! @inherit{QException::raise}
-	void raise() const override;
+	virtual void raise() const QTMVVM_EXCEPTION_OR;
 	//! @inherit{QException::clone}
-	QException *clone() const override;
+	virtual QTMVVM_EXCEPTION_BASE *clone() const QTMVVM_EXCEPTION_OR;
 
 protected:
 	//! @private
@@ -161,7 +161,7 @@ class Q_MVVMCORE_EXPORT ServiceDependencyException : public ServiceConstructionE
 	ServiceDependencyException(const QByteArray &iid);
 
 	void raise() const override;
-	QException *clone() const override;
+	QTMVVM_EXCEPTION_BASE *clone() const override;
 
 protected:
 	//! @private
diff --git a/src/mvvmcore/settingsconfigloader.cpp b/src/mvvmcore/settingsconfigloader.cpp
@@ -226,7 +226,7 @@ void SettingsConfigException::raise() const
 	throw *this;
 }
 
-QException *SettingsConfigException::clone() const
+QTMVVM_EXCEPTION_BASE *SettingsConfigException::clone() const
 {
 	return new SettingsConfigException{_what};
 }
diff --git a/src/mvvmcore/settingsconfigloader_p.h b/src/mvvmcore/settingsconfigloader_p.h
@@ -6,6 +6,7 @@
 
 #include "qtmvvmcore_global.h"
 #include "settingssetup.h"
+#include "exception.h"
 
 #include <settingsconfigimpl_p.h>
 
@@ -57,8 +58,8 @@ class Q_MVVMCORE_EXPORT SettingsConfigException : public SettingsLoaderException
 
 	const char *what() const noexcept override;
 
-	void raise() const override;
-	QException *clone() const override;
+	void raise() const QTMVVM_EXCEPTION_OR;
+	QTMVVM_EXCEPTION_BASE *clone() const QTMVVM_EXCEPTION_OR;
 
 private:
 	const QByteArray _what;
diff --git a/src/mvvmcore/settingssetup.h b/src/mvvmcore/settingssetup.h
@@ -6,9 +6,9 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qfileselector.h>
-#include <QtCore/qexception.h>
 
 #include "QtMvvmCore/qtmvvmcore_global.h"
+#include "QtMvvmCore/exception.h"
 
 namespace QtMvvm {
 
@@ -109,7 +109,7 @@ struct Setup
 }
 
 //! An exception throw in case loading a settings setup went wrong
-class SettingsLoaderException : public QException {};
+class SettingsLoaderException : public QTMVVM_EXCEPTION_BASE {};
 
 //! An interface for a generic settings setup loader
 class ISettingsSetupLoader
diff --git a/src/mvvmdatasynccore/datasyncsettingsaccessor.cpp b/src/mvvmdatasynccore/datasyncsettingsaccessor.cpp
@@ -1,6 +1,7 @@
 #include "datasyncsettingsaccessor.h"
 #include "datasyncsettingsaccessor_p.h"
 #include <QtCore/QRegularExpression>
+#include <QtMvvmCore/exception.h>
 
 #undef logDebug
 #undef logInfo
@@ -40,7 +41,7 @@ bool DataSyncSettingsAccessor::contains(const QString &key) const
 {
 	try {
 		return d->store->keys().contains(key);
-	} catch(QException &e) {
+	} catch (QTMVVM_EXCEPTION_BASE &e) {
 		logCritical() << "Failed to check if entry" << key << "exists with error:"
 					  << e.what();
 		return false;
@@ -54,7 +55,7 @@ QVariant DataSyncSettingsAccessor::load(const QString &key, const QVariant &defa
 	} catch (QtDataSync::NoDataException &e) {
 		Q_UNUSED(e)
 		return defaultValue;
-	} catch (QException &e) {
+	} catch (QTMVVM_EXCEPTION_BASE &e) {
 		logCritical() << "Failed to load entry" << key << "from datasync settings with error:"
 					  << e.what();
 		return defaultValue;
@@ -65,7 +66,7 @@ void DataSyncSettingsAccessor::save(const QString &key, const QVariant &value)
 {
 	try {
 		d->store->save({key, value});
-	} catch (QException &e) {
+	} catch (QTMVVM_EXCEPTION_BASE &e) {
 		logCritical() << "Failed to save entry" << key << "to datasync settings with error:"
 					  << e.what();
 	}
@@ -81,7 +82,7 @@ void DataSyncSettingsAccessor::remove(const QString &key)
 		for(const auto &rmKey : rmKeys)
 			d->store->remove(rmKey);
 		d->store->remove(key);
-	} catch (QException &e) {
+	} catch (QTMVVM_EXCEPTION_BASE &e) {
 		logCritical() << "Failed to remove entry" << key << "from datasync settings with error:"
 					  << e.what();
 	}
diff --git a/src/mvvmquick/quickpresenter.cpp b/src/mvvmquick/quickpresenter.cpp
@@ -7,29 +7,29 @@
 #include <QtCore/QDirIterator>
 #include <QtCore/QMetaMethod>
 
+#include <QtMvvmCore/exception.h>
+
 #include <QtQml/qqml.h>
 
 #include <QtMvvmCore/private/qtmvvm_logging_p.h>
 
 #include <qurlvalidator.h>
-namespace {
 
-void qtMvvmQuickInit()
+static void qtMvvmQuickInit()
 {
 	qmlRegisterType<QUrlValidator>("de.skycoder42.QtMvvm.Quick.Private", 1, 0, "UrlValidator");
 	QtMvvm::ServiceRegistry::instance()->registerObject<QtMvvm::InputViewFactory>(QtMvvm::ServiceRegistry::DestroyOnAppDestroy, true);
 	QtMvvm::ServiceRegistry::instance()->registerInterface<QtMvvm::IPresenter, QtMvvm::QuickPresenter>(QtMvvm::ServiceRegistry::DestroyOnAppDestroy, true);
 }
 
-void initResources()
+static void initResources()
 {
 #ifdef QT_STATIC
 	qtMvvmQuickInit();
 	Q_INIT_RESOURCE(qtmvvmquick_module);
 #endif
 }
 
-}
 Q_COREAPP_STARTUP_FUNCTION(qtMvvmQuickInit)
 
 using namespace QtMvvm;
@@ -223,7 +223,7 @@ QuickPresenter *QuickPresenterPrivate::currentPresenter()
 				   "Cannot register views if the current presenter does not extend QtMvvm::QuickPresenter");
 #endif
 		return static_cast<QuickPresenter*>(ServiceRegistry::instance()->service<IPresenter>());
-	} catch(QException &e) {
+	} catch (QTMVVM_EXCEPTION_BASE &e) {
 		qFatal("%s", e.what());
 	}
 }
diff --git a/src/mvvmwidgets/widgetspresenter.cpp b/src/mvvmwidgets/widgetspresenter.cpp
@@ -22,28 +22,26 @@
 #include <QtWidgets/QColorDialog>
 
 #include <QtMvvmCore/CoreApp>
+#include <QtMvvmCore/exception.h>
 #include <QtMvvmCore/private/qtmvvm_logging_p.h>
 
 #include <dialogmaster.h>
 #include <qurlvalidator.h>
 
-namespace {
-
-void qtMvvmWidgetsInit()
+static void qtMvvmWidgetsInit()
 {
 	QtMvvm::ServiceRegistry::instance()->registerObject<QtMvvm::InputWidgetFactory>(QtMvvm::ServiceRegistry::DestroyOnAppDestroy, true);
 	QtMvvm::ServiceRegistry::instance()->registerInterface<QtMvvm::IPresenter, QtMvvm::WidgetsPresenter>(QtMvvm::ServiceRegistry::DestroyOnAppDestroy, true);
 }
 
-void initResources()
+static void initResources()
 {
 #ifdef QT_STATIC
 	qtMvvmWidgetsInit();
-	Q_INIT_RESOURCE(qtmvvmsettingswidgets_module);
+	Q_INIT_RESOURCE(qtmvvmwidgets_module);
 #endif
 }
 
-}
 Q_COREAPP_STARTUP_FUNCTION(qtMvvmWidgetsInit)
 
 using namespace QtMvvm;
@@ -508,7 +506,7 @@ WidgetsPresenter *WidgetsPresenterPrivate::currentPresenter()
 				   "Cannot register widgets if the current presenter does not extend QtMvvm::WidgetsPresenter");
 #endif
 		return static_cast<WidgetsPresenter*>(ServiceRegistry::instance()->service<IPresenter>());
-	} catch(QException &e) {
+	} catch (QTMVVM_EXCEPTION_BASE &e) {
 		qFatal("%s", e.what());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ int SampleCoreApp::startApp(const QStringList &arguments)`
`29`	`29`	`.create();`
`30`	`30`	`show<SampleViewModel>();`
`31`	`31`	`return EXIT_SUCCESS;`
`32`		`- } catch (QException &e) {`
	`32`	`+ } catch (std::exception &e) {`
`33`	`33`	`qCritical() << e.what();`
`34`	`34`	`return EXIT_FAILURE;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,7 @@ SettingsEntryModel::EntryInfo::EntryInfo(SettingsElements::Entry entry, QUrl del`
`168`	`168`	`group(std::move(group))`
`169`	`169`	`{`
`170`	`170`	`static const QRegularExpression nameRegex(QStringLiteral("&(?!&)"),`
`171`		`- QRegularExpression::DontCaptureOption \|`
`172`		`- QRegularExpression::OptimizeOnFirstUsageOption);`
	`171`	`+ QRegularExpression::DontCaptureOption);`
`173`	`172`	`title.remove(nameRegex);`
`174`	`173`	`this->group.entries.clear();`
`175`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void PresenterException::raise() const`
`19`	`19`	`throw (*this);`
`20`	`20`	`}`
`21`	`21`
`22`		`-QException *PresenterException::clone() const`
	`22`	`+QTMVVM_EXCEPTION_BASE *PresenterException::clone() const`
`23`	`23`	`{`
`24`	`24`	`return new PresenterException(this);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ void ServiceExistsException::raise() const`
`335`	`335`	`throw (*this);`
`336`	`336`	`}`
`337`	`337`
`338`		`-QException *ServiceExistsException::clone() const`
	`338`	`+QTMVVM_EXCEPTION_BASE *ServiceExistsException::clone() const`
`339`	`339`	`{`
`340`	`340`	`return new ServiceExistsException(this);`
`341`	`341`	`}`
`@@ -360,7 +360,7 @@ void ServiceConstructionException::raise() const`
`360`	`360`	`throw (*this);`
`361`	`361`	`}`
`362`	`362`
`363`		`-QException *ServiceConstructionException::clone() const`
	`363`	`+QTMVVM_EXCEPTION_BASE *ServiceConstructionException::clone() const`
`364`	`364`	`{`
`365`	`365`	`return new ServiceConstructionException(this);`
`366`	`366`	`}`
`@@ -380,7 +380,7 @@ void ServiceDependencyException::raise() const`
`380`	`380`	`throw (*this);`
`381`	`381`	`}`
`382`	`382`
`383`		`-QException *ServiceDependencyException::clone() const`
	`383`	`+QTMVVM_EXCEPTION_BASE *ServiceDependencyException::clone() const`
`384`	`384`	`{`
`385`	`385`	`return new ServiceDependencyException(this);`
`386`	`386`	`}`