d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix breaking while using qmlRegisterSingletonInstance

Browse source
This commit is contained in:
Chethan2k1 2020-09-10 14:50:10 +05:30
parent a27662dc08
commit 2b5deabbdc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/DeviceVerificationFlow.cpp
View file

@ -41,9 +41,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
this->deleteLater(); this->deleteLater();
}); });
connect(this,&DeviceVerificationFlow::deleteFlow,this,[this](){ connect(this, &DeviceVerificationFlow::deleteFlow, this, [this]() { this->deleteLater(); });
this->deleteLater();
});
connect( connect(
ChatPage::instance(), ChatPage::instance(),

8
src/timeline/TimelineViewManager.cpp
View file

@ -140,8 +140,12 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
0, 0,
"UserProfileModel", "UserProfileModel",
"UserProfile needs to be instantiated on the C++ side"); "UserProfile needs to be instantiated on the C++ side");
qmlRegisterSingletonInstance("im.nheko", 1, 0, "TimelineManager", this); qmlRegisterSingletonType<TimelineViewManager>(
qmlRegisterSingletonInstance("im.nheko", 1, 0, "Settings", settings.data()); "im.nheko", 1, 0, "TimelineManager", [this](QQmlEngine *, QJSEngine *) { return this; });
qmlRegisterSingletonType<UserSettings>(
"im.nheko", 1, 0, "Settings", [this](QQmlEngine *, QJSEngine *) {
return this->settings.data();
});
qRegisterMetaType<mtx::events::collections::TimelineEvents>(); qRegisterMetaType<mtx::events::collections::TimelineEvents>();
qRegisterMetaType<std::vector<DeviceInfo>>(); qRegisterMetaType<std::vector<DeviceInfo>>();