update project struct

src/network/qqtprotocol.h

@@ -1,4 +1,4 @@
-#ifndef QQTPROTOCOL_H
+#ifndef QQTPROTOCOL_H
 #define QQTPROTOCOL_H
 
 #include <QObject>
@@ -17,6 +17,9 @@ public:
     explicit QQtProtocol ( QObject* parent = 0 );
     virtual ~QQtProtocol();
 
+    /*
+     * 建议：用户在继承类里的函数里直接调用[emit] write(...)
+    */
 Q_SIGNALS:
     qint64 write ( const QByteArray& );
 

src/qqt_3rdparty.pri

@@ -36,7 +36,7 @@ contains (DEFINES, __EXQUISITE__) {
     #gumbo widget
     #DEFINES += __GUMBOSUPPORT__
     contains (DEFINES, __GUMBOSUPPORT__) {
-        include ($$PWD/exquisite/gumbo/parser/gumbo-parser.pri)
+        include ($$PWD/network/gumbo/parser/gumbo-parser.pri)
-        include ($$PWD/exquisite/gumbo/query/gumbo-query.pri)
+        include ($$PWD/network/gumbo/query/gumbo-query.pri)
     }
 }

src/qqt_header.pri

@@ -310,24 +310,25 @@ defineReplace(qqt_header){
     isEmpty(1) : error("qqt_header(path) requires one arguments.")
     command += $${path}
     command += $${path}/core
-    command += $${path}/frame
-    command += $${path}/frame/dmmu
-    command += $${path}/network
-    command += $${path}/network/qextserialport
-    command += $${path}/network/soap
     command += $${path}/gui
     command += $${path}/widgets
-    command += $${path}/charts
     command += $${path}/multimedia
     command += $${path}/sql
     command += $${path}/printsupport
+    command += $${path}/network
+    command += $${path}/network/qextserialport
+    command += $${path}/frame
+    command += $${path}/frame/dmmu
+
+    #charts
+    command += $${path}/charts
+    command += $${path}/charts/customplot
 
     #exquisite widget
     command += $${path}/exquisite
     command += $${path}/exquisite/svgwidgets
     command += $${path}/exquisite/gifwidgets
     command += $${path}/exquisite/mathml
-    command += $${path}/exquisite/customplot
     command += $${path}/exquisite/pluginwatcher
 
     ##qr code library
@@ -342,11 +343,14 @@ defineReplace(qqt_header){
                     $${path}/exquisite/qrcode/qrdecode/zxing/win32/zxing/msvc
     }
 
+    ##soap (web service)
+    command += $${path}/network/soap
+
     ##gumbo library
-    command += $${path}/exquisite/gumbo/query/src
+    command += $${path}/network/gumbo/query/src
-    command += $${path}/exquisite/gumbo/parser/src
+    command += $${path}/network/gumbo/parser/src
     win32{
-        command += $${path}/exquisite/gumbo/parser/visualc/include
+        command += $${path}/network/gumbo/parser/visualc/include
     }
 
     return ($$command)

src/qqt_source.pri

@@ -457,10 +457,10 @@ contains (DEFINES, __EXQUISITE__) {
                 DEFINES += QCUSTOMPLOT_STATIC_LIBRARY
             }
         }
-        SOURCES += $$PWD/exquisite/customplot/qcpdocumentobject.cpp \
+        SOURCES += $$PWD/charts/customplot/qcpdocumentobject.cpp \
-                    $$PWD/exquisite/customplot/qcustomplot.cpp
+                    $$PWD/charts/customplot/qcustomplot.cpp
-        HEADERS += $$PWD/exquisite/customplot/qcpdocumentobject.h \
+        HEADERS += $$PWD/charts/customplot/qcpdocumentobject.h \
-                    $$PWD/exquisite/customplot/qcustomplot.h
+                    $$PWD/charts/customplot/qcustomplot.h
     }
 
     #pluginwatcher