From 07f1510dd3e1bfca5f0b379ccb1e6b87cb6eae53 Mon Sep 17 00:00:00 2001 From: Sale Djenic Date: Mon, 18 Oct 2021 13:10:32 +0200 Subject: [PATCH] Fixed issues after rebase to the `refactoring/base` branch. --- src/app/modules/main/chat_section/module.nim | 2 +- src/app/modules/startup/login/module.nim | 2 -- src/app/modules/startup/module.nim | 2 +- src/app/modules/startup/onboarding/module.nim | 4 +--- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim index 75b5a8f4c3..ad7c0f6f1a 100644 --- a/src/app/modules/main/chat_section/module.nim +++ b/src/app/modules/main/chat_section/module.nim @@ -2,7 +2,7 @@ import NimQml import io_interface import ../io_interface as delegate_interface import view, controller -import ../../../../app/boot/global_singleton +import ../../../core/global_singleton import ../../../../app_service/service/chat/service as chat_service import ../../../../app_service/service/community/service as community_service diff --git a/src/app/modules/startup/login/module.nim b/src/app/modules/startup/login/module.nim index 348e89ad78..cc3220f0ab 100644 --- a/src/app/modules/startup/login/module.nim +++ b/src/app/modules/startup/login/module.nim @@ -32,8 +32,6 @@ proc newModule*(delegate: delegate_interface.AccessInterface, accountsService) result.moduleLoaded = false - singletonInstance.engine.setRootContextProperty("loginModule", result.viewVariant) - method delete*(self: Module) = self.view.delete self.viewVariant.delete diff --git a/src/app/modules/startup/module.nim b/src/app/modules/startup/module.nim index 7472925335..1dd9333dee 100644 --- a/src/app/modules/startup/module.nim +++ b/src/app/modules/startup/module.nim @@ -2,7 +2,7 @@ import NimQml import io_interface import view, controller -import ../../../app/core/global_singleton +import ../../core/global_singleton import onboarding/module as onboarding_module import login/module as login_module diff --git a/src/app/modules/startup/onboarding/module.nim b/src/app/modules/startup/onboarding/module.nim index da54247394..67381db2d1 100644 --- a/src/app/modules/startup/onboarding/module.nim +++ b/src/app/modules/startup/onboarding/module.nim @@ -2,7 +2,7 @@ import NimQml import io_interface import ../io_interface as delegate_interface import view, controller, item -import ../../../../app/core/global_singleton +import ../../../core/global_singleton import ../../../../app_service/service/accounts/service_interface as accounts_service @@ -32,8 +32,6 @@ proc newModule*(delegate: delegate_interface.AccessInterface, accountsService) result.moduleLoaded = false - singletonInstance.engine.setRootContextProperty("onboardingModule", result.viewVariant) - method delete*(self: Module) = self.view.delete self.viewVariant.delete