openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Update ukui-service development files and libsearch.pro.

This commit is contained in:
iaom 2022-01-18 17:43:13 +08:00
parent ca249fbcb5
commit 4dae1f2d90
8 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/libukui-search-dev.install vendored
View File

@ -1,2 +1,3 @@
usr/include/ukui-search/* usr/include/ukui-search/*
usr/lib/*/pkgconfig/*.pc
usr/lib/*/libukui-search.so usr/lib/*/libukui-search.so

1
libsearch/development-files/header-files/UkuiSearchController Normal file
View File

@ -0,0 +1 @@
#include "search-controller.h"

6
libsearch/development-files/header-files/UkuiSearchPluginIface Normal file
View File

@ -0,0 +1,6 @@
#include "action-label.h"
#include "common-defines.h"
#include "plugin-iface.h"
#include "data-queue.h"
#include "search-plugin-iface.h"
#include "search-task-plugin-iface.h"

1
libsearch/development-files/header-files/UkuiSearchTask Normal file
View File

@ -0,0 +1 @@
#include "ukui-search-task.h"

2
libsearch/index/ukui-search-qdbus.cpp
View File

@ -45,7 +45,7 @@ void UkuiSearchQDBus::setInotifyMaxUserWatches() {
// this->tmpSystemQDBusInterface->call("setInotifyMaxUserWatchesStep3"); // this->tmpSystemQDBusInterface->call("setInotifyMaxUserWatchesStep3");
} }
int UkuiSearchQDBus::addInotifyUserInstances(int addNum) void UkuiSearchQDBus::addInotifyUserInstances(int addNum)
{ {
QDBusReply<int> reply = tmpSystemQDBusInterface->call("AddInotifyMaxUserInstance", addNum); QDBusReply<int> reply = tmpSystemQDBusInterface->call("AddInotifyMaxUserInstance", addNum);
if(reply.isValid()) { if(reply.isValid()) {

2
libsearch/index/ukui-search-qdbus.h
View File

@ -28,7 +28,7 @@ public:
UkuiSearchQDBus(); UkuiSearchQDBus();
~UkuiSearchQDBus(); ~UkuiSearchQDBus();
void setInotifyMaxUserWatches(); void setInotifyMaxUserWatches();
int addInotifyUserInstances(int addNum); void addInotifyUserInstances(int addNum);
private: private:
QDBusInterface* tmpSystemQDBusInterface; QDBusInterface* tmpSystemQDBusInterface;
}; };

21
libsearch/libsearch.pro
View File

@ -1,14 +1,16 @@
QT += core xml widgets dbus concurrent QT += core xml widgets dbus concurrent
VERSION = 0.0.1 VERSION = 1.0.0
DEFINES += VERSION='\\"$${VERSION}\\"' DEFINES += VERSION='\\"$${VERSION}\\"'
TARGET = ukui-search TARGET = ukui-search
TEMPLATE = lib TEMPLATE = lib
DEFINES += LIBSEARCH_LIBRARY DEFINES += LIBSEARCH_LIBRARY
CONFIG += create_pc create_prl no_install_prl
PKGCONFIG += gio-2.0 glib-2.0 gio-unix-2.0 gsettings-qt poppler-qt5 PKGCONFIG += gio-2.0 glib-2.0 gio-unix-2.0 gsettings-qt poppler-qt5
CONFIG += c++11 link_pkgconfig no_keywords lrelease CONFIG += c++11 link_pkgconfig no_keywords lrelease
QMAKE_CXXFLAGS += -Werror=return-type -Werror=return-local-addr -Werror=uninitialized
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use
@ -19,6 +21,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
PLUGIN_INSTALL_DIRS = $$[QT_INSTALL_LIBS]/ukui-search-plugins PLUGIN_INSTALL_DIRS = $$[QT_INSTALL_LIBS]/ukui-search-plugins
DEFINES += PLUGIN_INSTALL_DIRS='\\"$${PLUGIN_INSTALL_DIRS}\\"' DEFINES += PLUGIN_INSTALL_DIRS='\\"$${PLUGIN_INSTALL_DIRS}\\"'
QMAKE_CXXFLAGS += -execution-charset:utf-8
# You can also make your code fail to compile if it uses deprecated APIs. # You can also make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line. # In order to do so, uncomment the following line.
@ -66,10 +69,24 @@ INSTALLS += qm_files
# Default rules for deployment. # Default rules for deployment.
unix { unix {
target.path = $$[QT_INSTALL_LIBS] target.path = $$[QT_INSTALL_LIBS]
QMAKE_PKGCONFIG_NAME = ukui-search
QMAKE_PKGCONFIG_DESCRIPTION = Ukui-search Header files
QMAKE_PKGCONFIG_VERSION = $$VERSION
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_INCDIR = /usr/include/ukui-search
QMAKE_PKGCONFIG_CFLAGS += -I/usr/include/ukui-search
QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets glib-2.0 gio-2.0 gio-unix-2.0 poppler-qt5 gsettings-qt
INSTALLS += target INSTALLS += target
header.path = /usr/include/ukui-search header.path = /usr/include/ukui-search
header.files += *.h index/*.h appsearch/*.h settingsearch/*.h plugininterface/*.h websearch/*.h header.files += *.h index/*.h appsearch/*.h settingsearch/*.h plugininterface/*.h websearch/*.h \
searchinterface/ukui-search-task.h \
searchinterface/search-controller.h \
searchinterface/result-item.h
header.files += development-files/header-files/*
INSTALLS += header INSTALLS += header
} }
INCLUDEPATH += $$PWD/../libchinese-segmentation INCLUDEPATH += $$PWD/../libchinese-segmentation

1
libsearch/parser/binary-parser.cpp
View File

@ -5085,6 +5085,7 @@ int KBinaryParser:: readSSTRecord(readDataParam &rdParam, ppsInfoType PPS_info,
if(ulCount >= ulSize) if(ulCount >= ulSize)
return -1; return -1;
return 0;
} }
int KBinaryParser::read8BiffRecord(uchar ucFlag, ulong ulOff, ulong &ulNext, readDataParam &rdParam, excelRecord &eR) { int KBinaryParser::read8BiffRecord(uchar ucFlag, ulong ulOff, ulong &ulNext, readDataParam &rdParam, excelRecord &eR) {