From 7470b86880519522ee1a9188ee4ba785cfb44d41 Mon Sep 17 00:00:00 2001 From: shi_jq Date: Mon, 17 Mar 2025 14:42:21 +0800 Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoadStatWidget/LoadDefTblWidget.cpp | 2 +- .../LoadStatWidget/LoadStatPluginWidget.h | 2 +- .../PointLockWidget/CConditionModel.cpp | 2 +- .../plugin/PointLockWidget/CConditionModel.h | 2 +- .../PointLockWidget/CDbInterfaceMng.cpp | 44 +++++++++---------- .../plugin/PointLockWidget/CDbInterfaceMng.h | 2 +- .../gui/plugin/PointLockWidget/CPointInfo.cpp | 2 +- .../gui/plugin/PointLockWidget/CPointInfo.h | 2 +- .../plugin/PointLockWidget/CPointLockCommon.h | 2 +- .../CPointLockPluginWidget.cpp | 2 +- .../PointLockWidget/CPointLockPluginWidget.h | 4 +- .../PointLockWidget/CPointLockWidget.cpp | 12 ++--- .../plugin/PointLockWidget/CPointLockWidget.h | 2 +- .../plugin/PointLockWidget/PointLockCommon.h | 2 +- .../gui/plugin/ShiftWidget/CMyCalendar.cpp | 2 +- .../src/gui/plugin/ShiftWidget/CMyCalendar.h | 2 +- .../gui/plugin/ShiftWidget/CRecordWidget.cpp | 2 +- .../gui/plugin/ShiftWidget/CRecordWidget.h | 2 +- .../plugin/ShiftWidget/CShiftPluginWidget.cpp | 2 +- .../plugin/ShiftWidget/CShiftPluginWidget.h | 4 +- .../gui/plugin/ShiftWidget/CShiftWidget.cpp | 2 +- .../src/gui/plugin/ShiftWidget/CShiftWidget.h | 2 +- .../gui/plugin/ShiftWidget/HandoverWidget.cpp | 8 ++-- .../gui/plugin/ShiftWidget/HandoverWidget.h | 2 +- .../gui/plugin/ShiftWidget/QueryThread.cpp | 8 ++-- .../src/gui/plugin/ShiftWidget/QueryThread.h | 2 +- .../plugin/ShiftWidget/SelectGroupWidget.cpp | 2 +- .../plugin/ShiftWidget/SelectGroupWidget.h | 2 +- .../src/gui/plugin/ShiftWidget/ShiftCommon.h | 2 +- 29 files changed, 63 insertions(+), 63 deletions(-) diff --git a/product/src/gui/plugin/LoadStatWidget/LoadDefTblWidget.cpp b/product/src/gui/plugin/LoadStatWidget/LoadDefTblWidget.cpp index 8c5750a4..c0fb27c1 100644 --- a/product/src/gui/plugin/LoadStatWidget/LoadDefTblWidget.cpp +++ b/product/src/gui/plugin/LoadStatWidget/LoadDefTblWidget.cpp @@ -1,4 +1,4 @@ -#include "LoadDefTblWidget.h" +#include "LoadDefTblWidget.h" #include #include #include "CustomWidget/kbdselectpointdlg.h" diff --git a/product/src/gui/plugin/LoadStatWidget/LoadStatPluginWidget.h b/product/src/gui/plugin/LoadStatWidget/LoadStatPluginWidget.h index 9ec9b4ab..13b7b6b9 100644 --- a/product/src/gui/plugin/LoadStatWidget/LoadStatPluginWidget.h +++ b/product/src/gui/plugin/LoadStatWidget/LoadStatPluginWidget.h @@ -7,7 +7,7 @@ class LoadStatPluginWidget : 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/PointLockWidget/CConditionModel.cpp b/product/src/gui/plugin/PointLockWidget/CConditionModel.cpp index 771376e4..c078379d 100644 --- a/product/src/gui/plugin/PointLockWidget/CConditionModel.cpp +++ b/product/src/gui/plugin/PointLockWidget/CConditionModel.cpp @@ -1,4 +1,4 @@ -#include "CConditionModel.h" +#include "CConditionModel.h" #include "CDbInterfaceMng.h" CConditionModel::CConditionModel(QObject *parent) diff --git a/product/src/gui/plugin/PointLockWidget/CConditionModel.h b/product/src/gui/plugin/PointLockWidget/CConditionModel.h index 2cedbbe3..147e8d08 100644 --- a/product/src/gui/plugin/PointLockWidget/CConditionModel.h +++ b/product/src/gui/plugin/PointLockWidget/CConditionModel.h @@ -1,4 +1,4 @@ -#ifndef CCONDITIONMODEL_H +#ifndef CCONDITIONMODEL_H #define CCONDITIONMODEL_H #include diff --git a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp index 8f06871b..c2630bc8 100644 --- a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp +++ b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp @@ -1,4 +1,4 @@ -#include "CDbInterfaceMng.h" +#include "CDbInterfaceMng.h" #include "service/perm_mng_api/PermMngApi.h" #include "pub_logger_api/logger.h" @@ -93,7 +93,7 @@ int CDbInterfaceMng::getCtrlGrpTextByCtrlPoint(const QString &tag,QString &ctrlG { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery = QString("select %1.ctrl_act_name,%2.description from %1 left join %2 on %1.tag_name = %2.tag_name where %2.tag_name = '%3' ").arg("digital_control").arg("digital").arg(tag); @@ -105,7 +105,7 @@ int CDbInterfaceMng::getCtrlGrpTextByCtrlPoint(const QString &tag,QString &ctrlG ctrlGrpText = query.value(0).toString(); title = query.value(1).toString(); } - return kbdSuccess; + return iotSuccess; } QMap CDbInterfaceMng::getDigitalTextMapByKey(const QString &key) @@ -217,45 +217,45 @@ int CDbInterfaceMng::addPointLock(const QString &tag, int digitalValue, int chec { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("insert into point_lock_config_info(tag_name,actual_value,isEnable) values('%1',%2,%3)").arg(tag).arg(QString::number(digitalValue)).arg(QString::number(check)); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::delPointLock(const QString &tag, int digitalValue) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("delete from point_lock_config_info where tag_name='%1' and actual_value='%2'").arg(tag).arg(QString::number(digitalValue)); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::updatePointLock(const QString &tag, int digitalValue, bool isEnable) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("update point_lock_config_info set isEnable = %1 where tag_name = '%2' and actual_value = %3").arg(isEnable?1:0).arg(tag).arg(digitalValue); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } QString CDbInterfaceMng::getDevgByDevTag(const QString dev) @@ -267,7 +267,7 @@ int CDbInterfaceMng::addConditionLock(const QString &tag, int value, ConditionIn { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString(); sqlQuery = QString("insert into point_lock_condition_info(tag_name,actual_value,condition_tag_name,condition_desc,condition1" @@ -278,16 +278,16 @@ int CDbInterfaceMng::addConditionLock(const QString &tag, int value, ConditionIn qDebug()<execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::delConditionLock(const QString &tag, int value, ConditionInfoPtr condInfo) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sql = QString("delete from point_lock_condition_info where tag_name ='%1' and actual_value = %2 and condition_tag_name = '%3' ") @@ -295,12 +295,12 @@ int CDbInterfaceMng::delConditionLock(const QString &tag, int value, ConditionIn if(m_pWriteDb->execute(sql)) { - return kbdSuccess; + return iotSuccess; }else { - return kbdFailed; + return iotFailed; } - return kbdFailed; + return iotFailed; } QString CDbInterfaceMng::getDevgDescByDevTag(const QString dev) @@ -312,7 +312,7 @@ int CDbInterfaceMng::getPointDesc(const QString &tag, const QString &table, QStr { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery = QString("select description from %1 where tag_name = '%2' ").arg(table).arg(tag); @@ -322,9 +322,9 @@ int CDbInterfaceMng::getPointDesc(const QString &tag, const QString &table, QStr while(query.next()) { description = query.value(0).toString(); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } CDbInterfaceMng::CDbInterfaceMng() diff --git a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h index 723897e4..84c3d85a 100644 --- a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h +++ b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h @@ -1,4 +1,4 @@ -#ifndef CDBINTERFACEMNG_H +#ifndef CDBINTERFACEMNG_H #define CDBINTERFACEMNG_H #include diff --git a/product/src/gui/plugin/PointLockWidget/CPointInfo.cpp b/product/src/gui/plugin/PointLockWidget/CPointInfo.cpp index 020d323d..a2d958c5 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointInfo.cpp +++ b/product/src/gui/plugin/PointLockWidget/CPointInfo.cpp @@ -1,4 +1,4 @@ -#include "CPointInfo.h" +#include "CPointInfo.h" CPointInfo::CPointInfo() { diff --git a/product/src/gui/plugin/PointLockWidget/CPointInfo.h b/product/src/gui/plugin/PointLockWidget/CPointInfo.h index c2271e41..2502fcff 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointInfo.h +++ b/product/src/gui/plugin/PointLockWidget/CPointInfo.h @@ -1,4 +1,4 @@ -#ifndef CPOINTINFO_H +#ifndef CPOINTINFO_H #define CPOINTINFO_H diff --git a/product/src/gui/plugin/PointLockWidget/CPointLockCommon.h b/product/src/gui/plugin/PointLockWidget/CPointLockCommon.h index 6d9d89fd..99ffbe19 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockCommon.h +++ b/product/src/gui/plugin/PointLockWidget/CPointLockCommon.h @@ -1,4 +1,4 @@ -#ifndef CPOINTLOCKCOMMON_H +#ifndef CPOINTLOCKCOMMON_H #define CPOINTLOCKCOMMON_H #include diff --git a/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.cpp b/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.cpp index fdb616f3..98210c04 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.cpp +++ b/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CPointLockPluginWidget.h" +#include "CPointLockPluginWidget.h" #include #include "CPointLockWidget.h" #include "pub_logger_api/logger.h" diff --git a/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.h b/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.h index 2f7df159..7afa459d 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.h +++ b/product/src/gui/plugin/PointLockWidget/CPointLockPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CPOINTLOCKPLUGINWIDGET_H +#ifndef CPOINTLOCKPLUGINWIDGET_H #define CPOINTLOCKPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CPointLockPluginWidget : 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/PointLockWidget/CPointLockWidget.cpp b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp index a7c5bf31..9e45bfcf 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp +++ b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp @@ -1,4 +1,4 @@ -#include "CPointLockWidget.h" +#include "CPointLockWidget.h" #include "ui_CPointLockWidget.h" #include "db_api_ex/CDbApi.h" #include @@ -80,7 +80,7 @@ void CPointLockWidget::init(QString tag) if(m_strTable == "digital") { QString ctrlGrgText = QString(); - if(CDbInterfaceMng::instance()->getCtrlGrpTextByCtrlPoint(m_tag, ctrlGrgText, title) == kbdFailed) + if(CDbInterfaceMng::instance()->getCtrlGrpTextByCtrlPoint(m_tag, ctrlGrgText, title) == iotFailed) { return; } @@ -97,7 +97,7 @@ void CPointLockWidget::init(QString tag) ui->comboBox->setEditable(true); QValidator *validator = new QDoubleValidator(); ui->comboBox->lineEdit()->setValidator(validator); - if(CDbInterfaceMng::instance()->getPointDesc(m_tag, m_strTable, title) == kbdFailed) + if(CDbInterfaceMng::instance()->getPointDesc(m_tag, m_strTable, title) == iotFailed) { return; } @@ -149,7 +149,7 @@ void CPointLockWidget::slotDelCondition() int value; getCtrlValue(value); ConditionInfoPtr info = m_pCondModel->getDataByIndex(modelIndexList.at(0)); - if(CDbInterfaceMng::instance()->delConditionLock(m_tag,value,info) == kbdSuccess) + if(CDbInterfaceMng::instance()->delConditionLock(m_tag,value,info) == iotSuccess) { m_pCondModel->removeData(modelIndexList.at(0)); //showMess(tr("提示"),tr("删除成功")); @@ -183,7 +183,7 @@ void CPointLockWidget::slotOkClicked() PointInfoPtr pointInfo = CDbInterfaceMng::instance()->getLockConfigInfo(m_tag,value); if(pointInfo == Q_NULLPTR) { - if(CDbInterfaceMng::instance()->addPointLock(m_tag,value,1) == kbdFailed) + if(CDbInterfaceMng::instance()->addPointLock(m_tag,value,1) == iotFailed) { showMess(tr("提示"),tr("添加失败")); return; @@ -209,7 +209,7 @@ void CPointLockWidget::slotOkClicked() info->value1 = ui->dValue1->value(); info->value2 = ui->dValue2->value(); } - if(CDbInterfaceMng::instance()->addConditionLock(m_tag,value,info) == kbdSuccess) + if(CDbInterfaceMng::instance()->addConditionLock(m_tag,value,info) == iotSuccess) { initTable(); if(m_strTable == "analog" && ui->comboBox->findText(QString::number(value)) == -1) diff --git a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.h b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.h index 7f4f74dc..14fab6db 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.h +++ b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.h @@ -1,4 +1,4 @@ -#ifndef CPOINTLOCKWIDGET_H +#ifndef CPOINTLOCKWIDGET_H #define CPOINTLOCKWIDGET_H #include diff --git a/product/src/gui/plugin/PointLockWidget/PointLockCommon.h b/product/src/gui/plugin/PointLockWidget/PointLockCommon.h index 8cc6052c..2370dc9f 100644 --- a/product/src/gui/plugin/PointLockWidget/PointLockCommon.h +++ b/product/src/gui/plugin/PointLockWidget/PointLockCommon.h @@ -1,4 +1,4 @@ -#ifndef POINTLOCKCOMMON_H +#ifndef POINTLOCKCOMMON_H #define POINTLOCKCOMMON_H #include diff --git a/product/src/gui/plugin/ShiftWidget/CMyCalendar.cpp b/product/src/gui/plugin/ShiftWidget/CMyCalendar.cpp index c7fb5b33..bcf8d9d9 100644 --- a/product/src/gui/plugin/ShiftWidget/CMyCalendar.cpp +++ b/product/src/gui/plugin/ShiftWidget/CMyCalendar.cpp @@ -1,4 +1,4 @@ -#include "CMyCalendar.h" +#include "CMyCalendar.h" #include "ui_CMyCalendar.h" #include #include diff --git a/product/src/gui/plugin/ShiftWidget/CMyCalendar.h b/product/src/gui/plugin/ShiftWidget/CMyCalendar.h index 0f9997a1..ad6c02b7 100644 --- a/product/src/gui/plugin/ShiftWidget/CMyCalendar.h +++ b/product/src/gui/plugin/ShiftWidget/CMyCalendar.h @@ -1,4 +1,4 @@ -#ifndef CMYCALENDAR_H +#ifndef CMYCALENDAR_H #define CMYCALENDAR_H #include diff --git a/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp b/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp index 6d4905f2..90d1a645 100644 --- a/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp @@ -1,4 +1,4 @@ -#include "CRecordWidget.h" +#include "CRecordWidget.h" #include "ui_CRecordWidget.h" #include diff --git a/product/src/gui/plugin/ShiftWidget/CRecordWidget.h b/product/src/gui/plugin/ShiftWidget/CRecordWidget.h index a4a8a03c..8d333388 100644 --- a/product/src/gui/plugin/ShiftWidget/CRecordWidget.h +++ b/product/src/gui/plugin/ShiftWidget/CRecordWidget.h @@ -1,4 +1,4 @@ -#ifndef CRECORDWIDGET_H +#ifndef CRECORDWIDGET_H #define CRECORDWIDGET_H #include diff --git a/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.cpp b/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.cpp index 4b2aed26..2b7b50f4 100644 --- a/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CShiftPluginWidget.h" +#include "CShiftPluginWidget.h" #include "CShiftWidget.h" CShiftPluginWidget::CShiftPluginWidget(QObject *parent): QObject(parent) diff --git a/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.h b/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.h index 6b323688..f7e7a9e4 100644 --- a/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.h +++ b/product/src/gui/plugin/ShiftWidget/CShiftPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CSHIFTPLUGINWIDGET_H +#ifndef CSHIFTPLUGINWIDGET_H #define CSHIFTPLUGINWIDGET_H #include @@ -6,7 +6,7 @@ class CShiftPluginWidget : 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: CShiftPluginWidget(QObject *parent = 0); diff --git a/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp b/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp index 394752ce..bf298af3 100644 --- a/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp @@ -1,4 +1,4 @@ -#include "CShiftWidget.h" +#include "CShiftWidget.h" #include "ui_CShiftWidget.h" #include #include diff --git a/product/src/gui/plugin/ShiftWidget/CShiftWidget.h b/product/src/gui/plugin/ShiftWidget/CShiftWidget.h index 61ac368a..62307f36 100644 --- a/product/src/gui/plugin/ShiftWidget/CShiftWidget.h +++ b/product/src/gui/plugin/ShiftWidget/CShiftWidget.h @@ -1,4 +1,4 @@ -#ifndef CSHIFTWIDGET_H +#ifndef CSHIFTWIDGET_H #define CSHIFTWIDGET_H #include diff --git a/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp b/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp index 1594b043..a787a50f 100644 --- a/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp @@ -1,4 +1,4 @@ -#include "HandoverWidget.h" +#include "HandoverWidget.h" #include "ui_HandoverWidget.h" #include #include "QueryThread.h" @@ -393,17 +393,17 @@ void HandoverWidget::loadXml() CCommonConfigParse configParse; std::string strFilePath = "../../common/sysconfig/"; std::string strFileName = "shiftWidget.xml"; - if(kbdSuccess == configParse.load(strFilePath,strFileName)) + if(iotSuccess == configParse.load(strFilePath,strFileName)) { int num = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) + if(iotSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) { for(int index(1);index<=num;index++) { QString name = QString("level%1").arg(QString::number(index)); int value = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) + if(iotSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) { m_keyAlmLevelList.append(value); LOGDEBUG("loadXml() index:%d name:%s value:%d",index,name.toStdString().c_str(),value); diff --git a/product/src/gui/plugin/ShiftWidget/HandoverWidget.h b/product/src/gui/plugin/ShiftWidget/HandoverWidget.h index 45c039de..6438f114 100644 --- a/product/src/gui/plugin/ShiftWidget/HandoverWidget.h +++ b/product/src/gui/plugin/ShiftWidget/HandoverWidget.h @@ -1,4 +1,4 @@ -#ifndef HANDOVERWIDGET_H +#ifndef HANDOVERWIDGET_H #define HANDOVERWIDGET_H #include diff --git a/product/src/gui/plugin/ShiftWidget/QueryThread.cpp b/product/src/gui/plugin/ShiftWidget/QueryThread.cpp index b19c4107..0ec8a1ad 100644 --- a/product/src/gui/plugin/ShiftWidget/QueryThread.cpp +++ b/product/src/gui/plugin/ShiftWidget/QueryThread.cpp @@ -1,4 +1,4 @@ -#include "QueryThread.h" +#include "QueryThread.h" #include "pub_utility_api/CommonConfigParse.h" #include "Common.h" #include "pub_logger_api/logger.h" @@ -32,17 +32,17 @@ void QueryThread::loadXml() CCommonConfigParse configParse; std::string strFilePath = "../../common/sysconfig/"; std::string strFileName = "shiftWidget.xml"; - if(kbdSuccess == configParse.load(strFilePath,strFileName)) + if(iotSuccess == configParse.load(strFilePath,strFileName)) { int num = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) + if(iotSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) { for(int index(1);index<=num;index++) { QString name = QString("level%1").arg(QString::number(index)); int value = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) + if(iotSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) { m_keyAlmLevelList.append(value); LOGDEBUG("loadXml() index:%d name:%s value:%d",index,name.toStdString().c_str(),value); diff --git a/product/src/gui/plugin/ShiftWidget/QueryThread.h b/product/src/gui/plugin/ShiftWidget/QueryThread.h index 4794a3ad..a4b78698 100644 --- a/product/src/gui/plugin/ShiftWidget/QueryThread.h +++ b/product/src/gui/plugin/ShiftWidget/QueryThread.h @@ -1,4 +1,4 @@ -#ifndef QUERYTHREAD_H +#ifndef QUERYTHREAD_H #define QUERYTHREAD_H #include diff --git a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp index ac084af1..8a940419 100644 --- a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp @@ -1,4 +1,4 @@ -#include "SelectGroupWidget.h" +#include "SelectGroupWidget.h" #include "ui_SelectGroupWidget.h" #include diff --git a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h index f1eeca87..db1beb3c 100644 --- a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h +++ b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h @@ -1,4 +1,4 @@ -#ifndef SELECTGROUPWIDGET_H +#ifndef SELECTGROUPWIDGET_H #define SELECTGROUPWIDGET_H #include diff --git a/product/src/gui/plugin/ShiftWidget/ShiftCommon.h b/product/src/gui/plugin/ShiftWidget/ShiftCommon.h index 08c16c0d..3d710249 100644 --- a/product/src/gui/plugin/ShiftWidget/ShiftCommon.h +++ b/product/src/gui/plugin/ShiftWidget/ShiftCommon.h @@ -1,4 +1,4 @@ -#ifndef SHIFTCOMMON_H +#ifndef SHIFTCOMMON_H #define SHIFTCOMMON_H typedef struct