重构目录结构

rms.pro

@@ -28,8 +28,7 @@ LIBS += -L$${PROJECT_ROOT}/lib/sqlite3 -lqsqlite \
         -L$${PROJECT_ROOT}/lib/log4qt -llog4qt
 
 # 引入头文件目录
-INCLUDEPATH += $${PROJECT_ROOT}/include \
-      $${PROJECT_ROOT}/src/rms/include
+INCLUDEPATH += $${PROJECT_ROOT}/include
 
 RESOURCES += \
     res.qrc

src/rms/rms.pri

 HEADERS += \
-    $$PWD/include/mainwindow.h \
-    $$PWD/include/log.h \
-    $$PWD/include/slot/dayincomequery_dialog.h \
-    $$PWD/include/slot/add_reduce_dialog.h \
-    $$PWD/include/slot/staffregister_dialog.h \
-    $$PWD/include/slot/varietymenu_dialog.h \
-    $$PWD/include/slot/dishescount_dialog.h \
-    $$PWD/include/slot/foodinfo_dialog.h \
-    $$PWD/include/slot/monthincomequery_dialog.h \
-    $$PWD/include/slot/selectseat_dialog.h \
-    $$PWD/include/slot/stockqquery_dialog.h \
-    $$PWD/include/slot/check_out_dialog.h \
-    $$PWD/include/slot/orderdishes_dialog.h \
-    $$PWD/include/ui/ui_stockquery_dialog.h \
-    $$PWD/include/ui/ui_mainwindow.h \
-    $$PWD/include/ui/ui_foodinfo_dialog.h \
-    $$PWD/include/ui/ui_add_reduce_dialog.h \
-    $$PWD/include/ui/ui_orderdishes_dialog.h \
-    $$PWD/include/ui/ui_monthincomequery_dialog.h \
-    $$PWD/include/ui/ui_selectseat_dialog.h \
-    $$PWD/include/ui/ui_staffregister_dialog.h \
-    $$PWD/include/ui/ui_check_out_dialog.h \
-    $$PWD/include/ui/ui_dayincomequery_dialog.h \
-    $$PWD/include/ui/ui_dishescount_dialog.h \
-    $$PWD/include/ui/ui_varietymenu_dialog.h \
-    $$PWD/include/db/day_statistics.h \
-    $$PWD/include/db/order_dishes.h \
-    $$PWD/include/db/food_info.h \
-    $$PWD/include/db/user_management.h \
-    $$PWD/include/db/seat_info.h \
-    $$PWD/include/db/check.h \
-    $$PWD/include/db/manage_database.h \
-    $$PWD/include/db/sales.h \
-    $$PWD/include/model/account.h \
-    $$PWD/include/slot/login_slot.h \
-    $$PWD/include/ui/login_dlg_ui.h \
-    $$PWD/include/service/init_db_service.h \
-    $$PWD/include/service/account_service.h \
-    $$PWD/include/service/sql_file_service.h \
-    $$PWD/include/db/search_table_db.h
+    $$PWD/sources/mainwindow.h \
+    $$PWD/sources/log.h \
+    $$PWD/sources/slot/dayincomequery_dialog.h \
+    $$PWD/sources/slot/add_reduce_dialog.h \
+    $$PWD/sources/slot/staffregister_dialog.h \
+    $$PWD/sources/slot/varietymenu_dialog.h \
+    $$PWD/sources/slot/dishescount_dialog.h \
+    $$PWD/sources/slot/foodinfo_dialog.h \
+    $$PWD/sources/slot/monthincomequery_dialog.h \
+    $$PWD/sources/slot/selectseat_dialog.h \
+    $$PWD/sources/slot/stockqquery_dialog.h \
+    $$PWD/sources/slot/check_out_dialog.h \
+    $$PWD/sources/slot/orderdishes_dialog.h \
+    $$PWD/sources/ui/ui_stockquery_dialog.h \
+    $$PWD/sources/ui/ui_mainwindow.h \
+    $$PWD/sources/ui/ui_foodinfo_dialog.h \
+    $$PWD/sources/ui/ui_add_reduce_dialog.h \
+    $$PWD/sources/ui/ui_orderdishes_dialog.h \
+    $$PWD/sources/ui/ui_monthincomequery_dialog.h \
+    $$PWD/sources/ui/ui_selectseat_dialog.h \
+    $$PWD/sources/ui/ui_staffregister_dialog.h \
+    $$PWD/sources/ui/ui_check_out_dialog.h \
+    $$PWD/sources/ui/ui_dayincomequery_dialog.h \
+    $$PWD/sources/ui/ui_dishescount_dialog.h \
+    $$PWD/sources/ui/ui_varietymenu_dialog.h \
+    $$PWD/sources/db/day_statistics.h \
+    $$PWD/sources/db/order_dishes.h \
+    $$PWD/sources/db/food_info.h \
+    $$PWD/sources/db/user_management.h \
+    $$PWD/sources/db/seat_info.h \
+    $$PWD/sources/db/check.h \
+    $$PWD/sources/db/manage_database.h \
+    $$PWD/sources/db/sales.h \
+    $$PWD/sources/model/account.h \
+    $$PWD/sources/slot/login_slot.h \
+    $$PWD/sources/ui/login_dlg_ui.h \
+    $$PWD/sources/service/init_db_service.h \
+    $$PWD/sources/service/account_service.h \
+    $$PWD/sources/service/sql_file_service.h \
+    $$PWD/sources/db/search_table_db.h
 
 SOURCES += \
     $$PWD/sources/main.cpp \

src/rms/sources/db/check.cpp

-#include "db/check.h"
+#include "check.h"
 
 Check::Check() {}
 

src/rms/sources/db/day_statistics.cpp

-#include "db/day_statistics.h"
+#include "day_statistics.h"
 
 DayStatistics::DayStatistics() {}
 

src/rms/sources/db/food_info.cpp

-#include "db/food_info.h"
+#include "food_info.h"
 
 FoodInfo::FoodInfo() {}
 

src/rms/sources/db/manage_database.cpp

-#include "db/manage_database.h"
+#include "manage_database.h"
 
 ManageDatabase::ManageDatabase() {}
 

src/rms/sources/db/order_dishes.cpp

-#include "db/order_dishes.h"
+#include "order_dishes.h"
 
 OrderDishes::OrderDishes() {}
 

src/rms/sources/db/sales.cpp

-#include "db/sales.h"
+#include "sales.h"
 
 Sales::Sales() {}
 
-QString Sales::searchDailySales(QString year, QString month,
-                                      QString day) {
+QString Sales::searchDailySales(QString year, QString month, QString day) {
   double sumMoney = 0;
   QSqlDatabase db = ManageDatabase::connect();
   if (ManageDatabase::openDb(db)) {

src/rms/sources/db/search_table_db.cpp

-#include "db/search_table_db.h"
+#include "search_table_db.h"
 
 SearchTableDb::SearchTableDb() {}
 

src/rms/sources/db/seat_info.cpp

-#include "db/seat_info.h"
+#include "seat_info.h"
 
 SeatInfo::SeatInfo() {}
 

src/rms/sources/db/user_management.cpp

-#include "db/user_management.h"
+#include "user_management.h"
 
 UserManagement::UserManagement() {}
 

src/rms/sources/model/account.cpp

-#include "model/account.h"
+#include "account.h"
 
 QString Account::getDlm() const { return dlm; }
 

src/rms/sources/service/account_service.cpp

-#include "service/account_service.h"
+#include "account_service.h"
 
 AccountService::AccountService() {}
 

src/rms/sources/service/init_db_service.cpp

-#include "service/init_db_service.h"
-#include "db/manage_database.h"
-#include "db/search_table_db.h"
-#include "service/sql_file_service.h"
+#include "init_db_service.h"
+#include "../db/manage_database.h"
+#include "../db/search_table_db.h"
+#include "sql_file_service.h"
 
 InitDbService::InitDbService() { log = Log::createLog()->getLogger(); }
 

src/rms/include/service/init_db_service.h → src/rms/sources/service/init_db_service.h

@@ -7,7 +7,7 @@
 #include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QString>
-#include "log.h"
+#include "../log.h"
 #include "log4qt/logger.h"
 
 /**

src/rms/sources/service/sql_file_service.cpp

-#include "service/sql_file_service.h"
-#include "db/manage_database.h"
-#include "log.h"
+#include "sql_file_service.h"
+#include "../db/manage_database.h"
+#include "../log.h"
 #include "log4qt/logger.h"
 
 SqlFileService::SqlFileService() {}

src/rms/sources/slot/add_reduce_dialog.cpp

-#include "slot/add_reduce_dialog.h"
-#include "db/food_info.h"
-#include "slot/dishescount_dialog.h"
-#include "ui/ui_add_reduce_dialog.h"
+#include "add_reduce_dialog.h"
+#include "../db/food_info.h"
+#include "../ui/ui_add_reduce_dialog.h"
+#include "dishescount_dialog.h"
 
 Add_Reduce_Dialog::Add_Reduce_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::Add_Reduce_Dialog) {

src/rms/include/slot/add_reduce_dialog.h → src/rms/sources/slot/add_reduce_dialog.h

@@ -6,7 +6,7 @@
 #include <QMessageBox>
 #include <QStringList>
 
-#include "db/order_dishes.h"
+#include "../db/order_dishes.h"
 
 namespace Ui {
 class Add_Reduce_Dialog;

src/rms/sources/slot/check_out_dialog.cpp

-#include "slot/check_out_dialog.h"
-#include "db/check.h"
-#include "ui/ui_check_out_dialog.h"
+#include "check_out_dialog.h"
+#include "../db/check.h"
+#include "../ui/ui_check_out_dialog.h"
 
 Check_OutDialog::Check_OutDialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::Check_OutDialog) {

src/rms/include/slot/check_out_dialog.h → src/rms/sources/slot/check_out_dialog.h

@@ -4,7 +4,7 @@
 #include <QDebug>
 #include <QDialog>
 #include <QMessageBox>
-#include "db/seat_info.h"
+#include "../db/seat_info.h"
 
 namespace Ui {
 class Check_OutDialog;

src/rms/sources/slot/dayincomequery_dialog.cpp

-#include "slot/dayincomequery_dialog.h"
-#include "db/sales.h"
-#include "ui/ui_dayincomequery_dialog.h"
+#include "dayincomequery_dialog.h"
+#include "../db/sales.h"
+#include "../ui/ui_dayincomequery_dialog.h"
 
 DayIncomeQuery_Dialog::DayIncomeQuery_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::DayIncomeQuery_Dialog) {

src/rms/sources/slot/dishescount_dialog.cpp

-#include "slot/dishescount_dialog.h"
+#include "dishescount_dialog.h"
 #include <QDebug>
 #include <QMessageBox>
-#include "ui/ui_dishescount_dialog.h"
+#include "../ui/ui_dishescount_dialog.h"
 
 DishesCountDialog::DishesCountDialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::DishesCountDialog) {

src/rms/sources/slot/foodinfo_dialog.cpp

-#include "slot/foodinfo_dialog.h"
-#include "ui/ui_foodinfo_dialog.h"
+#include "foodinfo_dialog.h"
+#include "../ui/ui_foodinfo_dialog.h"
 
 FoodInfo_Dialog::FoodInfo_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::FoodInfo_Dialog) {

src/rms/include/slot/foodinfo_dialog.h → src/rms/sources/slot/foodinfo_dialog.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "db/food_info.h"
+#include "../db/food_info.h"
 
 namespace Ui {
 class FoodInfo_Dialog;

src/rms/sources/slot/login_slot.cpp

-#include "slot/login_slot.h"
-#include "service/account_service.h"
+#include "login_slot.h"
+#include "../service/account_service.h"
 
 LoginSlot::LoginSlot() {
   ui = new LoginDlgUi();

src/rms/include/slot/login_slot.h → src/rms/sources/slot/login_slot.h

@@ -5,7 +5,7 @@
 #include <QDialog>
 #include <QMessageBox>
 
-#include "ui/login_dlg_ui.h"
+#include "../ui/login_dlg_ui.h"
 
 class LoginSlot : public QObject {
   Q_OBJECT

src/rms/sources/slot/monthincomequery_dialog.cpp

-#include "slot/monthincomequery_dialog.h"
-#include "ui/ui_monthincomequery_dialog.h"
+#include "monthincomequery_dialog.h"
+#include "../ui/ui_monthincomequery_dialog.h"
 
 MonthIncomeQuery_Dialog::MonthIncomeQuery_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::MonthIncomeQuery_Dialog) {

src/rms/include/slot/monthincomequery_dialog.h → src/rms/sources/slot/monthincomequery_dialog.h

@@ -6,7 +6,7 @@
 #include <QDialog>
 #include <QMessageBox>
 
-#include "db/sales.h"
+#include "../db/sales.h"
 
 namespace Ui {
 class MonthIncomeQuery_Dialog;

src/rms/sources/slot/orderdishes_dialog.cpp

-#include "slot/orderdishes_dialog.h"
+#include "orderdishes_dialog.h"
 #include <QStandardItemModel>
-#include "db/food_info.h"
-#include "db/order_dishes.h"
-#include "slot/dishescount_dialog.h"
-#include "ui/ui_orderdishes_dialog.h"
+#include "../db/food_info.h"
+#include "../db/order_dishes.h"
+#include "../ui/ui_orderdishes_dialog.h"
+#include "dishescount_dialog.h"
 
 OrderDishesDialog::OrderDishesDialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::OrderDishesDialog) {

src/rms/sources/slot/selectseat_dialog.cpp

-#include "slot/selectseat_dialog.h"
-#include "ui/ui_selectseat_dialog.h"
+#include "selectseat_dialog.h"
+#include "../ui/ui_selectseat_dialog.h"
 
 SelectSeat_Dialog::SelectSeat_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::SelectSeat_Dialog) {

src/rms/include/slot/selectseat_dialog.h → src/rms/sources/slot/selectseat_dialog.h

@@ -10,7 +10,7 @@
 #include <QStandardItemModel>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
-#include "db/seat_info.h"
+#include "../db/seat_info.h"
 #include "orderdishes_dialog.h"
 
 namespace Ui {

src/rms/sources/slot/staffregister_dialog.cpp

-#include "slot/staffregister_dialog.h"
-#include "db/user_management.h"
-#include "ui/ui_staffregister_dialog.h"
+#include "staffregister_dialog.h"
+#include "../db/user_management.h"
+#include "../ui/ui_staffregister_dialog.h"
 
 staffRegister_Dialog::staffRegister_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::staffRegister_Dialog) {

src/rms/sources/slot/stockqquery_dialog.cpp

-#include "slot/stockqquery_dialog.h"
-#include "ui/ui_stockquery_dialog.h"
+#include "stockqquery_dialog.h"
+#include "../ui/ui_stockquery_dialog.h"
 
 StockqQuery_Dialog::StockqQuery_Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::StockqQuery_Dialog) {

src/rms/sources/slot/varietymenu_dialog.cpp

-#include "slot/varietymenu_dialog.h"
-#include "ui/ui_varietymenu_dialog.h"
+#include "varietymenu_dialog.h"
+#include "../ui/ui_varietymenu_dialog.h"
 
 VarietyMenuDialog::VarietyMenuDialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::VarietyMenuDialog) {

src/rms/sources/ui/login_dlg_ui.cpp

-#include "ui/login_dlg_ui.h"
+#include "login_dlg_ui.h"
 
 LoginDlgUi::LoginDlgUi(QWidget *parent) : QDialog(parent) {
   //设置登录框对象名

src/rms/sources/ui/ui_add_reduce_dialog.cpp

-#include "ui/ui_add_reduce_dialog.h"
+#include "ui_add_reduce_dialog.h"
 
 void Ui_Add_Reduce_Dialog::setupUi(QDialog *Add_Reduce_Dialog) {
   if (Add_Reduce_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_check_out_dialog.cpp

-#include "ui/ui_check_out_dialog.h"
+#include "ui_check_out_dialog.h"
 
 void Ui_Check_Out_Dialog::setupUi(QDialog *Check_OutDialog) {
   if (Check_OutDialog->objectName().isEmpty())

src/rms/sources/ui/ui_dayincomequery_dialog.cpp

-#include "ui/ui_dayincomequery_dialog.h"
+#include "ui_dayincomequery_dialog.h"
 
 void Ui_DayIncomeQuery_Dialog::setupUi(QDialog *DayIncomeQuery_Dialog) {
   if (DayIncomeQuery_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_dishescount_dialog.cpp

-#include "ui/ui_dishescount_dialog.h"
+#include "ui_dishescount_dialog.h"
 
 void Ui_DishesCount_Dialog::setupUi(QDialog *DishesCountDialog) {
   if (DishesCountDialog->objectName().isEmpty())

src/rms/sources/ui/ui_foodinfo_dialog.cpp

-#include "ui/ui_foodinfo_dialog.h"
+#include "ui_foodinfo_dialog.h"
 
 void Ui_FoodInfo_Dialog::setupUi(QDialog *FoodInfo_Dialog) {
   if (FoodInfo_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_mainwindow.cpp

-#include "ui/ui_mainwindow.h"
+#include "ui_mainwindow.h"
 #include <QGraphicsOpacityEffect>
 
 void Ui_MainWindow::setupUi(QMainWindow *MainWindow) {

src/rms/sources/ui/ui_monthincomequery_dialog.cpp

-#include "ui/ui_monthincomequery_dialog.h"
+#include "ui_monthincomequery_dialog.h"
 
 void Ui_MonthIncomeQuery_Dialog::setupUi(QDialog *MonthIncomeQuery_Dialog) {
   if (MonthIncomeQuery_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_orderdishes_dialog.cpp

-#include "ui/ui_orderdishes_dialog.h"
+#include "ui_orderdishes_dialog.h"
 
 void Ui_OrderDishes_Dialog::setupUi(QDialog *OrderDishesDialog) {
   if (OrderDishesDialog->objectName().isEmpty())

src/rms/sources/ui/ui_selectseat_dialog.cpp

@@ -6,7 +6,7 @@
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
-#include "ui/ui_selectseat_dialog.h"
+#include "ui_selectseat_dialog.h"
 
 void Ui_SelectSeat_Dialog::setupUi(QDialog *SelectSeat_Dialog) {
   if (SelectSeat_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_staffregister_dialog.cpp

-#include "ui/ui_staffregister_dialog.h"
+#include "ui_staffregister_dialog.h"
 
 void Ui_staffRegister_Dialog::setupUi(QDialog *staffRegister_Dialog) {
   if (staffRegister_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_stockquery_dialog.cpp

-#include "ui/ui_stockquery_dialog.h"
+#include "ui_stockquery_dialog.h"
 
 void Ui_StockqQuery_Dialog::setupUi(QDialog *StockqQuery_Dialog) {
   if (StockqQuery_Dialog->objectName().isEmpty())

src/rms/sources/ui/ui_varietymenu_dialog.cpp

-#include "ui/ui_varietymenu_dialog.h"
+#include "ui_varietymenu_dialog.h"
 
 void Ui_VarietyMenu_Dialog::setupUi(QDialog *VarietyMenuDialog) {
   if (VarietyMenuDialog->objectName().isEmpty())