Merge pull request #24 from sunfengsheng/main

Modify the specification

appmatch/app-match.pri

@@ -1,7 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/app-match.h \
-
-SOURCES += \
-    $$PWD/app-match.cpp \

appsearch/appsearch.pri

@@ -1,5 +1,7 @@
 INCLUDEPATH += $$PWD
 
-HEADERS +=
+HEADERS += \
+    $$PWD/app-match.h \
 
-SOURCES +=
+SOURCES += \
+    $$PWD/app-match.cpp \

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;

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;
 
 };

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.