From 1caa9002228398a8f586365ddc7a7c79ef5d5760 Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Fri, 7 Jun 2019 12:19:31 +0900
Subject: change hs to qhs

---
 app/CMakeLists.txt        |  2 +-
 app/main.cpp              | 11 ++++++-----
 conf.d/cmake/config.cmake |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 0259a79..51f4e97 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -59,7 +59,7 @@ target_link_libraries(mixer
 
 if(NOT NATIVE_BUILD)
     target_link_libraries(mixer
-        homescreen
+        qthomescreen
 		qtwindowmanager
     )
 endif()
diff --git a/app/main.cpp b/app/main.cpp
index 6fdc1ce..77145bf 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -32,7 +32,7 @@
 #include <QtQuick/qquickview.h>
 #include <QQuickWindow>
 #ifndef NATIVE_BUILD
-#include <libhomescreen.hpp>
+#include <qlibhomescreen.h>
 #include <qlibwindowmanager.h>
 #else
 #include <QScreen>
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
 
 #ifndef NATIVE_BUILD
-		LibHomeScreen* hs = new LibHomeScreen();
+		QLibHomeScreen* qhs = new QLibHomeScreen();
 		QLibWindowmanager* qwm = new QLibWindowmanager();
 
 		// WindowManager
@@ -97,9 +97,9 @@ int main(int argc, char *argv[])
 
 		// HomeScreen
 		std::string token = secret.toStdString();
-		hs->init(port, token.c_str());
+		qhs->init(port, token.c_str());
 		// Set the event handler for Event_ShowWindow which will activate the surface for windowmanager
-		hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [qwm, &graphic_role](json_object *object){
+		qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow, [qwm, &graphic_role](json_object *object){
 			qDebug("Surface %s got showWindow\n", graphic_role.toStdString().c_str());
 			qwm->activateWindow(graphic_role);
 		});
@@ -121,7 +121,8 @@ int main(int argc, char *argv[])
 		window->setFlags(window->flags() & ~Qt::FramelessWindowHint); // Remove the borderless flag
 		window->setHeight(QGuiApplication::primaryScreen()->geometry().height());
 #else
-		QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()));
+		// QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()));
+		qhs->setQuickWindow(window);
 #endif
 	}
 	else
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 76a9c3f..6b8ad13 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -68,7 +68,7 @@ set (PKG_REQUIRED_LIST
 	json-c
 	libsystemd>=222
 	afb-daemon
-	#libhomescreen
+	# qlibhomescreen
 	# qlibwindowmanager
 )
 
-- 
cgit 1.2.3-korg