Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CCollectionEvent.cpp

@@ -49,6 +49,22 @@
      return TRUE;
   }

   void CCollectionEvent::setReport(CReport* pReport)
   {
      m_rptids.clear();
      m_reports.clear();
      if (pReport != nullptr) {
         m_rptids.push_back(pReport->getReportId());
         m_reports.push_back(pReport);
      }
   }

   unsigned int CCollectionEvent::getFirstReportID()
   {
      if (m_reports.empty()) return 0;
      return m_reports.front()->getReportId();
   }

   BOOL CCollectionEvent::deleteReport(unsigned int nReportId)
   {
      BOOL bDelete = FALSE;
@@ -74,6 +90,12 @@
      return nullptr;
   }

   CReport* CCollectionEvent::getFirstReport()
   {
      if (m_reports.empty()) return nullptr;
      return m_reports.front();
   }

   std::vector<CReport*>& CCollectionEvent::getReports()
   {
      return m_reports;