From e34c3a752bef781bb5ec6518a074aa4a8239cc63 Mon Sep 17 00:00:00 2001
From: Barry <870709864@qq.com>
Date: Sun, 5 Jun 2022 18:28:39 +0800
Subject: [PATCH] refactor: move bufferutil to QtScrcpyCore

---
 QtScrcpy/CMakeLists.txt                                | 10 +++++-----
 QtScrcpy/{ => QtScrcpyCore/src}/common/common.pri      |  0
 QtScrcpy/{ => QtScrcpyCore/src}/common/qscrcpyevent.h  |  0
 .../src/device/controller}/bufferutil.cpp              |  0
 .../src/device/controller}/bufferutil.h                |  0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename QtScrcpy/{ => QtScrcpyCore/src}/common/common.pri (100%)
 rename QtScrcpy/{ => QtScrcpyCore/src}/common/qscrcpyevent.h (100%)
 rename QtScrcpy/{util => QtScrcpyCore/src/device/controller}/bufferutil.cpp (100%)
 rename QtScrcpy/{util => QtScrcpyCore/src/device/controller}/bufferutil.h (100%)

diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt
index 444556c..b540418 100755
--- a/QtScrcpy/CMakeLists.txt
+++ b/QtScrcpy/CMakeLists.txt
@@ -101,9 +101,9 @@ source_group(QtScrcpyCore/src/adb FILES ${QC_ADB_SOURCES})
 
 # common
 set(QC_COMMON_SOURCES
-    common/qscrcpyevent.h
+    QtScrcpyCore/src/common/qscrcpyevent.h
 )
-source_group(common FILES ${QC_COMMON_SOURCES})
+source_group(QtScrcpyCore/src/common FILES ${QC_COMMON_SOURCES})
 
 # include
 set(QC_INCLUDE_SOURCES
@@ -120,6 +120,8 @@ set(QC_DEVICE_SOURCES
     QtScrcpyCore/src/device/android/keycodes.h
     QtScrcpyCore/src/device/controller/controller.h
     QtScrcpyCore/src/device/controller/controller.cpp
+    QtScrcpyCore/src/device/controller/bufferutil.h
+    QtScrcpyCore/src/device/controller/bufferutil.cpp
     QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.h
     QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.cpp
     QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.h
@@ -201,8 +203,6 @@ set(QC_UTIL_SOURCES
     util/compat.h
     util/config.h
     util/config.cpp
-    util/bufferutil.h
-    util/bufferutil.cpp
     util/mousetap/mousetap.h
     util/mousetap/mousetap.cpp
 )
@@ -294,7 +294,7 @@ add_executable(${PROJECT_NAME} ${QC_RUNTIME_TYPE} ${QC_PROJECT_SOURCES})
 #
 
 target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/adb)
-target_include_directories(${PROJECT_NAME} PRIVATE common)
+target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/common)
 target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device)
 target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/filehandler)
 target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/android)
diff --git a/QtScrcpy/common/common.pri b/QtScrcpy/QtScrcpyCore/src/common/common.pri
similarity index 100%
rename from QtScrcpy/common/common.pri
rename to QtScrcpy/QtScrcpyCore/src/common/common.pri
diff --git a/QtScrcpy/common/qscrcpyevent.h b/QtScrcpy/QtScrcpyCore/src/common/qscrcpyevent.h
similarity index 100%
rename from QtScrcpy/common/qscrcpyevent.h
rename to QtScrcpy/QtScrcpyCore/src/common/qscrcpyevent.h
diff --git a/QtScrcpy/util/bufferutil.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/bufferutil.cpp
similarity index 100%
rename from QtScrcpy/util/bufferutil.cpp
rename to QtScrcpy/QtScrcpyCore/src/device/controller/bufferutil.cpp
diff --git a/QtScrcpy/util/bufferutil.h b/QtScrcpy/QtScrcpyCore/src/device/controller/bufferutil.h
similarity index 100%
rename from QtScrcpy/util/bufferutil.h
rename to QtScrcpy/QtScrcpyCore/src/device/controller/bufferutil.h