From de591ea6f94b8e4825da3eed3574bffc3c5bd087 Mon Sep 17 00:00:00 2001
From: sunfengsheng <327123947@qq.com>
Date: Mon, 28 Dec 2020 21:56:41 -0800
Subject: [PATCH] Modify the specification

---
 appmatch/app-match.pri                         |  7 -------
 {appmatch => appsearch}/app-match.cpp          |  0
 {appmatch => appsearch}/app-match.h            |  0
 appsearch/appsearch.pri                        |  6 ++++--
 .../setting-match.cpp                          | 18 +++++++++---------
 .../setting-match.h                            | 10 +++++-----
 .../settingsearch.pri                          |  0
 ukui-search.pro                                |  3 +--
 8 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 appmatch/app-match.pri
 rename {appmatch => appsearch}/app-match.cpp (100%)
 rename {appmatch => appsearch}/app-match.h (100%)
 rename {settingsmatch => settingsearch}/setting-match.cpp (82%)
 rename {settingsmatch => settingsearch}/setting-match.h (72%)
 rename settingsmatch/setting-match.pri => settingsearch/settingsearch.pri (100%)

diff --git a/appmatch/app-match.pri b/appmatch/app-match.pri
deleted file mode 100644
index 4a3d55d..0000000
--- a/appmatch/app-match.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/app-match.h \
-
-SOURCES += \
-    $$PWD/app-match.cpp \
diff --git a/appmatch/app-match.cpp b/appsearch/app-match.cpp
similarity index 100%
rename from appmatch/app-match.cpp
rename to appsearch/app-match.cpp
diff --git a/appmatch/app-match.h b/appsearch/app-match.h
similarity index 100%
rename from appmatch/app-match.h
rename to appsearch/app-match.h
diff --git a/appsearch/appsearch.pri b/appsearch/appsearch.pri
index 224e0af..4a3d55d 100644
--- a/appsearch/appsearch.pri
+++ b/appsearch/appsearch.pri
@@ -1,5 +1,7 @@
 INCLUDEPATH += $$PWD
 
-HEADERS +=
+HEADERS += \
+    $$PWD/app-match.h \
 
-SOURCES +=
+SOURCES += \
+    $$PWD/app-match.cpp \
diff --git a/settingsmatch/setting-match.cpp b/settingsearch/setting-match.cpp
similarity index 82%
rename from settingsmatch/setting-match.cpp
rename to settingsearch/setting-match.cpp
index 0447e9d..5665765 100644
--- a/settingsmatch/setting-match.cpp
+++ b/settingsearch/setting-match.cpp
@@ -2,7 +2,7 @@
 
 SettingsMatch::SettingsMatch(QObject *parent) : QObject(parent)
 {
-    XmlElement();
+    xmlElement();
 }
 
 QStringList SettingsMatch::startMatchApp(const QString &source){
@@ -12,7 +12,7 @@ QStringList SettingsMatch::startMatchApp(const QString &source){
     return settingList;
 }
 
-void SettingsMatch::XmlElement(){
+void SettingsMatch::xmlElement(){
     QString pinyinIndex;
     QString ChineseIndex;
 
@@ -29,8 +29,8 @@ void SettingsMatch::XmlElement(){
     while(!node.isNull()){
         QDomElement element=node.toElement();
         QString key=element.attribute("name");;
-        m_Chine_searchResult=m_Chine_searchList.value(key);
-        m_Pinyin_searchResult=m_Pinyin_searchList.value(key);
+        m_chine_searchResult=m_chine_searchList.value(key);
+        m_pinyin_searchResult=m_pinyin_searchList.value(key);
          QDomNodeList list=element.childNodes();
          for(int i=0;i<list.count();++i){
              QDomNode n=list.at(i);
@@ -40,7 +40,7 @@ void SettingsMatch::XmlElement(){
              }
              if(n.nodeName()==QString::fromLocal8Bit("pinyinfunc")){
                  pinyinIndex+=QString::fromLocal8Bit(":")+n.toElement().text();
-                 m_Pinyin_searchResult.append(pinyinIndex);
+                 m_pinyin_searchResult.append(pinyinIndex);
              }
 
              if(n.nodeName()==QString::fromLocal8Bit("ChinesePlugin")){
@@ -49,11 +49,11 @@ void SettingsMatch::XmlElement(){
              if(n.nodeName()==QString::fromLocal8Bit("ChineseFunc")){
                  ChineseIndex+=QString::fromLocal8Bit("/")+n.toElement().text();
 
-             m_Chine_searchResult.append(ChineseIndex);
+             m_chine_searchResult.append(ChineseIndex);
              }
          }
-        m_Pinyin_searchList.insert(key,m_Pinyin_searchResult);
-        m_Chine_searchList.insert(key,m_Chine_searchResult);
+        m_pinyin_searchList.insert(key,m_pinyin_searchResult);
+        m_chine_searchList.insert(key,m_chine_searchResult);
 
         node=node.nextSibling();
     }
@@ -67,7 +67,7 @@ QStringList SettingsMatch::matching(){
     QStringList regmatch;
     QString key;
     QMap<QString, QStringList>::const_iterator i;
-    for(i=m_Chine_searchList.constBegin();i!=m_Chine_searchList.constEnd();++i){
+    for(i=m_chine_searchList.constBegin();i!=m_chine_searchList.constEnd();++i){
         regmatch=*i;
         key=i.key();
 //        qDebug()<<key;
diff --git a/settingsmatch/setting-match.h b/settingsearch/setting-match.h
similarity index 72%
rename from settingsmatch/setting-match.h
rename to settingsearch/setting-match.h
index effcf35..c555cf1 100644
--- a/settingsmatch/setting-match.h
+++ b/settingsearch/setting-match.h
@@ -19,14 +19,14 @@ public:
     QStringList startMatchApp(const QString &source);
 
 private:
-    void XmlElement();
+    void xmlElement();
     QStringList matching();
 
 private:
-    QMap<QString,QStringList> m_Pinyin_searchList;
-    QMap<QString,QStringList> m_Chine_searchList;
-    QStringList m_Pinyin_searchResult;
-    QStringList m_Chine_searchResult;
+    QMap<QString,QStringList> m_pinyin_searchList;
+    QMap<QString,QStringList> m_chine_searchList;
+    QStringList m_pinyin_searchResult;
+    QStringList m_chine_searchResult;
     QString m_sourceText;
 
 };
diff --git a/settingsmatch/setting-match.pri b/settingsearch/settingsearch.pri
similarity index 100%
rename from settingsmatch/setting-match.pri
rename to settingsearch/settingsearch.pri
diff --git a/ukui-search.pro b/ukui-search.pro
index ea03398..25c2e86 100644
--- a/ukui-search.pro
+++ b/ukui-search.pro
@@ -21,8 +21,7 @@ include(model/model.pri)
 include(control/control.pri)
 include(appsearch/appsearch.pri)
 include(singleapplication/qt-single-application.pri)
-include(settingsmatch/setting-match.pri)
-include(appmatch/app-match.pri)
+include(settingsearch/settingsearch.pri)
 
 LIBS = -lxapian -lgsettings-qt
 # Default rules for deployment.