Resolve confilicts.

debian/changelog

@@ -14,6 +14,11 @@ ukui-search (0.0.1+0118) v101; urgency=medium
  -- zhangjiaping <zhangjiaping@zhangpengfei>  Mon, 18 Jan 2021 14:3
 6:12 +0800
 
+ukui-search (0.0.1+0115) v101; urgency=medium
+
+  * Bugs fixed.
+ -- zhangpengfei <zhangpengfei@kylinos.cn>  Fri, 15 Jan 2021 11:01:24 +0800
+
 ukui-search (0.0.1+0114) v101; urgency=medium
 
   * Bugs fixed.

libsearch/index/file-searcher.cpp

@@ -50,7 +50,7 @@ void FileSearcher::onKeywordSearch(QString keyword,QQueue<QString> *searchResult
         int num = 5;
         int resultCount = 0;
         int total = 0;
-        while(total<40)
+        while(total<20)
         {
             resultCount = keywordSearchfile(uniqueSymbol1,keyword,"0",1,begin,num);
             if(resultCount == 0 || resultCount == -1)
@@ -68,7 +68,7 @@ void FileSearcher::onKeywordSearch(QString keyword,QQueue<QString> *searchResult
         int num = 5;
         int resultCount = 0;
         int total = 0;
-        while(total<40)
+        while(total<20)
         {
             resultCount = keywordSearchfile(uniqueSymbol2,keyword,"1",1,begin,num);
             if(resultCount == 0 || resultCount == -1)
@@ -87,7 +87,7 @@ void FileSearcher::onKeywordSearch(QString keyword,QQueue<QString> *searchResult
         int resultCount = 0;
         int total = 0;
 
-        while(total<40)
+        while(total<20)
         {
             keywordSearchContent(uniqueSymbol3,keyword,begin,num);
             if(resultCount == 0 || resultCount == -1)

src/content-widget.cpp

@@ -423,6 +423,7 @@ void ContentWidget::refreshSearchList(const QVector<QStringList>& lists) {
     }
     m_resultList->setFixedHeight(0);
     m_detailView->clearLayout();
+    m_contentDetailList.clear();
 
     if (! m_appList.isEmpty())
         m_appList.clear();