diff --git a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp index 532ac516..331923b2 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp @@ -1,4 +1,4 @@ -#include "AddObjAlarmDialog.h" +#include "AddObjAlarmDialog.h" #include "ui_AddObjAlarmDialog.h" #include "AlarmMng.h" #include "AlarmCalcParaTableDelegate.h" diff --git a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h index 73f060f7..dcb05a27 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h +++ b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h @@ -1,4 +1,4 @@ -#ifndef ADDOBJALARMDIALOG_H +#ifndef ADDOBJALARMDIALOG_H #define ADDOBJALARMDIALOG_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.cpp index 5bca2473..2645a5e9 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.cpp @@ -1,4 +1,4 @@ -#include "AlarmCalcInfo.h" +#include "AlarmCalcInfo.h" AlarmCalcInfo::AlarmCalcInfo() { diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.h b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.h index 8195d702..6a604dca 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcInfo.h @@ -1,4 +1,4 @@ -#ifndef ALARMCALCINFO_H +#ifndef ALARMCALCINFO_H #define ALARMCALCINFO_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.cpp index 7cf3903f..40be7a07 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.cpp @@ -1,4 +1,4 @@ -#include "AlarmCalcParaTableDelegate.h" +#include "AlarmCalcParaTableDelegate.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.h b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.h index 742cc974..3192a4b6 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableDelegate.h @@ -1,4 +1,4 @@ -#ifndef ALARMCALCPARATABLEDELEGATE_H +#ifndef ALARMCALCPARATABLEDELEGATE_H #define ALARMCALCPARATABLEDELEGATE_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.cpp index d33b7c4a..0973d952 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.cpp @@ -1,4 +1,4 @@ -#include "AlarmCalcParaTableModel.h" +#include "AlarmCalcParaTableModel.h" AlarmCalcParaTableModel::AlarmCalcParaTableModel(QObject *parent,QTableView *view) : m_view(view), diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.h b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.h index 55e6ab40..48dff9e3 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmCalcParaTableModel.h @@ -1,4 +1,4 @@ -#ifndef ALARMCALCPARATABLEMODEL_H +#ifndef ALARMCALCPARATABLEMODEL_H #define ALARMCALCPARATABLEMODEL_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.cpp index 0676e1e4..d641ca75 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.cpp @@ -1,4 +1,4 @@ -#include "AlarmDevTreeModel.h" +#include "AlarmDevTreeModel.h" #include "AlarmDevTreeView.h" #include "QTreeWidgetItem" #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.h b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.h index 7ed62cad..19e374ee 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeModel.h @@ -1,4 +1,4 @@ -#ifndef ALARMDEVTREEMODEL_H +#ifndef ALARMDEVTREEMODEL_H #define ALARMDEVTREEMODEL_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.cpp index 2c082800..e5830fcd 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.cpp @@ -1,4 +1,4 @@ -#include "AlarmDevTreeView.h" +#include "AlarmDevTreeView.h" AlarmDevTreeView::AlarmDevTreeView(QWidget *parent) :QTreeView(parent) diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.h b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.h index 5194ab70..e395c8ee 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmDevTreeView.h @@ -1,4 +1,4 @@ -#ifndef ALARMDEVTREEVIEW_H +#ifndef ALARMDEVTREEVIEW_H #define ALARMDEVTREEVIEW_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageCommon.h b/product/src/gui/plugin/AlarmManageWidget/AlarmManageCommon.h index 3e51774a..bac86bc8 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageCommon.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageCommon.h @@ -1,4 +1,4 @@ -#ifndef ALARMMANAGECOMMON_H +#ifndef ALARMMANAGECOMMON_H #define ALARMMANAGECOMMON_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp index e45883d7..f640473a 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp @@ -1,4 +1,4 @@ -#include "AlarmManageForm.h" +#include "AlarmManageForm.h" #include "ui_AlarmManageForm.h" #include "AlarmManageWidget.h" diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.h b/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.h index 732865c0..82fbcba1 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.h @@ -1,4 +1,4 @@ -#ifndef ALARMMANAGEFORM_H +#ifndef ALARMMANAGEFORM_H #define ALARMMANAGEFORM_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.cpp index 2cd3cd80..24dc5c92 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.cpp @@ -1,4 +1,4 @@ -#include "AlarmManagePluginWidget.h" +#include "AlarmManagePluginWidget.h" #include "AlarmManageForm.h" AlarmManagePluginWidget::AlarmManagePluginWidget(QObject *parent): QObject(parent) { diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.h b/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.h index 70c0e510..59befa0d 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManagePluginWidget.h @@ -1,4 +1,4 @@ -#ifndef ALARMMANAGEPLUGINWIDGET_H +#ifndef ALARMMANAGEPLUGINWIDGET_H #define ALARMMANAGEPLUGINWIDGET_H #include @@ -8,7 +8,7 @@ class AlarmManagePluginWidget : public QObject, public CPluginWidgetInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") + Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID) Q_INTERFACES(CPluginWidgetInterface) public: diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp index e94d8892..cdb4d02d 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp @@ -1,4 +1,4 @@ -#include "AlarmManageWidget.h" +#include "AlarmManageWidget.h" #include "ui_AlarmManageWidget.h" #include "pub_logger_api/logger.h" #include "perm_mng_api/PermMngApi.h" diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h index 4d16b937..45cd1e1e 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h @@ -1,4 +1,4 @@ -#ifndef ALARMMANAGEWIDGET_H +#ifndef ALARMMANAGEWIDGET_H #define ALARMMANAGEWIDGET_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp index a1ed277d..a75ce0af 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp @@ -1,4 +1,4 @@ -#include "AlarmMng.h" +#include "AlarmMng.h" #include "public/pub_sysinfo_api/SysInfoApi.h" #include "pub_utility_api/CharUtil.h" #include "perm_mng_api/PermMngApi.h" diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h index cf7e8e11..f3f1d2b9 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h @@ -1,4 +1,4 @@ -#ifndef ALARMMNG_H +#ifndef ALARMMNG_H #define ALARMMNG_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.cpp index ae6363ba..c3ba9fc7 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.cpp @@ -1,4 +1,4 @@ -#include "AlarmPointTableModel.h" +#include "AlarmPointTableModel.h" #include "AlarmMng.h" #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.h b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.h index f66f0b08..31c09ef5 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableModel.h @@ -1,4 +1,4 @@ -#ifndef ALARMPOINTTABLEMODEL_H +#ifndef ALARMPOINTTABLEMODEL_H #define ALARMPOINTTABLEMODEL_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.cpp index 6eebe83b..e8989cd6 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.cpp @@ -1,4 +1,4 @@ -#include "AlarmPointTableView.h" +#include "AlarmPointTableView.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.h b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.h index 85899a27..849321a8 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmPointTableView.h @@ -1,4 +1,4 @@ -#ifndef ALARMPOINTTABLEVIEW_H +#ifndef ALARMPOINTTABLEVIEW_H #define ALARMPOINTTABLEVIEW_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.cpp index 95e79356..4985f39c 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.cpp @@ -1,4 +1,4 @@ -#include "AlarmUuidBase64.h" +#include "AlarmUuidBase64.h" #include "boost/typeof/typeof.hpp" #include "boost/algorithm/string/replace.hpp" diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.h b/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.h index c626d30a..0a30f852 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmUuidBase64.h @@ -1,4 +1,4 @@ -#ifndef ALARMUUIDBASE64_H +#ifndef ALARMUUIDBASE64_H #define ALARMUUIDBASE64_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/PointInfo.cpp b/product/src/gui/plugin/AlarmManageWidget/PointInfo.cpp index e1ee3c5a..cccc99f9 100644 --- a/product/src/gui/plugin/AlarmManageWidget/PointInfo.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/PointInfo.cpp @@ -1,4 +1,4 @@ -#include "PointInfo.h" +#include "PointInfo.h" PointInfo::PointInfo() { diff --git a/product/src/gui/plugin/AlarmManageWidget/PointInfo.h b/product/src/gui/plugin/AlarmManageWidget/PointInfo.h index 3b1ed5c9..2b68dc0b 100644 --- a/product/src/gui/plugin/AlarmManageWidget/PointInfo.h +++ b/product/src/gui/plugin/AlarmManageWidget/PointInfo.h @@ -1,4 +1,4 @@ -#ifndef POINTINFO_H +#ifndef POINTINFO_H #define POINTINFO_H #include diff --git a/product/src/gui/plugin/AlarmManageWidget/main.cpp b/product/src/gui/plugin/AlarmManageWidget/main.cpp index 51043f01..1449ae4c 100644 --- a/product/src/gui/plugin/AlarmManageWidget/main.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/main.cpp @@ -1,4 +1,4 @@ -#include "AlarmManageForm.h" +#include "AlarmManageForm.h" #include #include "pub_logger_api/logger.h" #include "service/perm_mng_api/PermMngApi.h" @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); std::string name="admin"; - std::string password ="kbdct"; + std::string password ="admin"; iot_public::StartLogSystem("HMI", "hmi"); iot_net::initMsgBus("HMI", "HMI");