Merge branch '0508-dev' into 'V4-dev'

Optimize code.

See merge request kylin-desktop/ukui-search!17

libsearch/index/construct-document.cpp

@@ -19,7 +19,7 @@
  */
 #include "construct-document.h"
 #include "file-utils.h"
-#include "chinese-seg/chinese-segmentation.h"
+#include "chinese-segmentation.h"
 #include <QDebug>
 #include <QThread>
 #include <QUrl>

libsearch/index/index-generator.cpp

@@ -28,7 +28,7 @@
 #include "file-utils.h"
 #include "index-generator.h"
 #include "global-settings.h"
-#include "chinese-seg/chinese-segmentation.h"
+#include "chinese-segmentation.h"
 #include "construct-document.h"
 #include <QStandardPaths>
 

libsearch/index/search-manager.h

@@ -39,9 +39,9 @@
 #include <list>
 #include <queue>
 
-#include "../file-utils.h"
-#include "../global-settings.h"
-#include "chinese-seg/chinese-segmentation.h"
+#include "file-utils.h"
+#include "global-settings.h"
+#include "chinese-segmentation.h"
 
 
 #define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString()

libsearch/libsearch.pro

@@ -59,22 +59,13 @@ unix {
     target.path = $$[QT_INSTALL_LIBS]
     INSTALLS += target
 
-    header.path = /usr/include/ukui-search/
-    header.files += *.h
-    header_appsearch.path = /usr/include/ukui-search/appsearch/
-    header_appsearch.files = appsearch/*.h
-    header_index.path = /usr/include/ukui-search/index/
-    header_index.files = index/*.h
-    header_settingsearch.path = /usr/include/ukui-search/settingsearch/
-    header_settingsearch.files = settingsearch/*.h
-
-    INSTALLS += header header_appsearch header_index header_settingsearch
+    header.path = /usr/include/ukui-search
+    header.files += *.h index/*.h appsearch/*.h settingsearch/*.h
+    INSTALLS += header
 }
 
-
-
-#INCLUDEPATH += $$PWD/../libchinese-segmentation
-#DEPENDPATH += $$PWD/../libchinese-segmentation
+INCLUDEPATH += $$PWD/../libchinese-segmentation
+DEPENDPATH += $$PWD/../libchinese-segmentation
 
 #DISTFILES += \
 #    ../translations/libsearch/libukui-search_zh_CN.ts