[ref]同步711

This commit is contained in:
shi_jq 2025-03-17 11:05:48 +08:00
parent 409d23d2f6
commit 29f4a38f83
20 changed files with 23 additions and 21 deletions

View File

@ -1,4 +1,4 @@
#include "CAddShieldDialog.h" #include "CAddShieldDialog.h"
#include "ui_CAddShieldDialog.h" #include "ui_CAddShieldDialog.h"
#include "CDbInfoManage.h" #include "CDbInfoManage.h"
#include "service/perm_mng_api/PermMngApi.h" #include "service/perm_mng_api/PermMngApi.h"

View File

@ -1,4 +1,4 @@
#ifndef CADDSHIELDDIALOG_H #ifndef CADDSHIELDDIALOG_H
#define CADDSHIELDDIALOG_H #define CADDSHIELDDIALOG_H
#include <QDialog> #include <QDialog>

View File

@ -1,4 +1,4 @@
#include "CAlarmShield.h" #include "CAlarmShield.h"
#include "ui_CAlarmShield.h" #include "ui_CAlarmShield.h"
#include "CDbInfoManage.h" #include "CDbInfoManage.h"
#include "CShieldTableDelegate.h" #include "CShieldTableDelegate.h"

View File

@ -1,4 +1,4 @@
#ifndef CALARMSHIELD_H #ifndef CALARMSHIELD_H
#define CALARMSHIELD_H #define CALARMSHIELD_H
#include <QWidget> #include <QWidget>

View File

@ -1,4 +1,4 @@
#include <QWidget> #include <QWidget>
#include "CAlarmShieldPluginWidget.h" #include "CAlarmShieldPluginWidget.h"
#include "CAlarmShield.h" #include "CAlarmShield.h"

View File

@ -1,4 +1,4 @@
#ifndef CALARMSHIELDPLUGINWIDGET_H #ifndef CALARMSHIELDPLUGINWIDGET_H
#define CALARMSHIELDPLUGINWIDGET_H #define CALARMSHIELDPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -7,7 +7,7 @@
class CAlarmShieldPluginWidget : public QObject, public CPluginWidgetInterface class CAlarmShieldPluginWidget : public QObject, public CPluginWidgetInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
Q_INTERFACES(CPluginWidgetInterface) Q_INTERFACES(CPluginWidgetInterface)
public: public:

View File

@ -1,4 +1,4 @@
#include "CDbInfoManage.h" #include "CDbInfoManage.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include <QSqlQuery> #include <QSqlQuery>

View File

@ -1,4 +1,4 @@
#ifndef CDBINFOMANAGE_H #ifndef CDBINFOMANAGE_H
#define CDBINFOMANAGE_H #define CDBINFOMANAGE_H
#include "dbms/rdb_api/CRdbAccess.h" #include "dbms/rdb_api/CRdbAccess.h"

View File

@ -1,4 +1,4 @@
#include "CDevTreeModel.h" #include "CDevTreeModel.h"
#include "CDbInfoManage.h" #include "CDbInfoManage.h"
#include "CDevTreeView.h" #include "CDevTreeView.h"
@ -86,6 +86,8 @@ E_Tree_ItemType CDevTreeModel::currentType()
QVariant CDevTreeModel::headerData(int section, Qt::Orientation orientation, int role) const QVariant CDevTreeModel::headerData(int section, Qt::Orientation orientation, int role) const
{ {
Q_UNUSED(section);
if(role == Qt::DisplayRole) if(role == Qt::DisplayRole)
{ {
if(orientation == Qt::Horizontal) if(orientation == Qt::Horizontal)

View File

@ -1,4 +1,4 @@
#ifndef CDEVTREEMODEL_H #ifndef CDEVTREEMODEL_H
#define CDEVTREEMODEL_H #define CDEVTREEMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>

View File

@ -1,4 +1,4 @@
#include "CDevTreeView.h" #include "CDevTreeView.h"
#include "CDevTreeModel.h" #include "CDevTreeModel.h"
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <QMenu> #include <QMenu>

View File

@ -1,4 +1,4 @@
#ifndef CDEVTREEVIEW_H #ifndef CDEVTREEVIEW_H
#define CDEVTREEVIEW_H #define CDEVTREEVIEW_H
#include <QTreeView> #include <QTreeView>

View File

@ -1,4 +1,4 @@
#include "CHeaderView.h" #include "CHeaderView.h"
#include <QPainter> #include <QPainter>
#include <QCheckBox> #include <QCheckBox>
#include <QApplication> #include <QApplication>

View File

@ -1,4 +1,4 @@
#ifndef CHEADERVIEW_H #ifndef CHEADERVIEW_H
#define CHEADERVIEW_H #define CHEADERVIEW_H
#include <QHeaderView> #include <QHeaderView>

View File

@ -1,4 +1,4 @@
#include "CShieldTableDelegate.h" #include "CShieldTableDelegate.h"
#include "CShieldTableModel.h" #include "CShieldTableModel.h"
#include "CDbInfoManage.h" #include "CDbInfoManage.h"
#include <QPainter> #include <QPainter>

View File

@ -1,4 +1,4 @@
#ifndef CSHIELDTABLEDELEGATE_H #ifndef CSHIELDTABLEDELEGATE_H
#define CSHIELDTABLEDELEGATE_H #define CSHIELDTABLEDELEGATE_H
#include <QStyledItemDelegate> #include <QStyledItemDelegate>

View File

@ -1,4 +1,4 @@
#include "CShieldTableModel.h" #include "CShieldTableModel.h"
#include "CDbInfoManage.h" #include "CDbInfoManage.h"
CShieldTableModel::CShieldTableModel(QObject *parent) CShieldTableModel::CShieldTableModel(QObject *parent)

View File

@ -1,4 +1,4 @@
#ifndef CSHIELDTABLEMODEL_H #ifndef CSHIELDTABLEMODEL_H
#define CSHIELDTABLEMODEL_H #define CSHIELDTABLEMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>

View File

@ -1,4 +1,4 @@
#ifndef CSHIELDINFO_H #ifndef CSHIELDINFO_H
#define CSHIELDINFO_H #define CSHIELDINFO_H
#include <QString> #include <QString>

View File

@ -1,4 +1,4 @@
#include "CAlarmShield.h" #include "CAlarmShield.h"
#include <QApplication> #include <QApplication>
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "service/perm_mng_api/PermMngApi.h" #include "service/perm_mng_api/PermMngApi.h"