App: QSet replace QVector

Author: KangLin

App/Client/FrmActive.cpp

@@ -7,12 +7,12 @@
 
 static Q_LOGGING_CATEGORY(log, "App.FrmActive")
 
-CFrmActive::CFrmActive(QVector<COperate*> &operates,
-                               CParameterApp &parameterApp,
-                               QMenu* pOperate,
-                               QAction* pStop,
-                               RabbitCommon::CRecentMenu *pRecentMenu,
-                               QWidget *parent)
+CFrmActive::CFrmActive(QSet<COperate *> &operates,
+                       CParameterApp &parameterApp,
+                       QMenu* pOperate,
+                       QAction* pStop,
+                       RabbitCommon::CRecentMenu *pRecentMenu,
+                       QWidget *parent)
     : QWidget(parent)
     , m_pDockTitleBar(nullptr)
     , m_pOperate(pOperate)
@@ -165,10 +165,12 @@ CFrmActive::~CFrmActive()
 void CFrmActive::slotCustomContextMenu(const QPoint &pos)
 {
     QMenu menu;
-    int r = m_pTableView->currentIndex().row();
+    QModelIndex index = m_pTableView->currentIndex();
+    int r = index.row();
     if(-1 < r && r < m_Operates.size())
     {
-        auto c = m_Operates[r];
+        QVariant v = m_pModel->item(index.row(), m_nId)->data();
+        COperate* c = v.value<COperate*>();
         if(c) {
             auto m = c->GetMenu();
             //menu.addMenu(m);

App/Client/FrmActive.h

@@ -5,7 +5,7 @@
 #include <QToolBar>
 #include <QToolButton>
 #include <QStandardItemModel>
-#include <QVector>
+#include <QSet>
 #include "Operate.h"
 #include "TitleBar.h"
 #include "RabbitRecentMenu.h"
@@ -15,7 +15,7 @@ class CFrmActive : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CFrmActive(QVector<COperate*> &operates,
+    explicit CFrmActive(QSet<COperate*> &operates,
                             CParameterApp &parameterApp,
                             QMenu* pOperate,
                             QAction* pStop,
@@ -35,7 +35,7 @@ private Q_SLOTS:
     void slotClicked(const QModelIndex& index);
     void slotAddToFavorite();
 private:
-    QVector<COperate*> &m_Operates;
+    QSet<COperate*> &m_Operates;
     CParameterApp &m_ParameterApp;
     QMenu* m_pOperate;
     QAction* m_pStop;

App/Client/mainwindow.cpp

@@ -929,7 +929,7 @@ int MainWindow::Start(COperate *pOperate, bool set, QString szFile)
         slotInformation(tr("Starting: ") + pOperate->Name());
 
     //* Show view. \see: slotRunning()
-    if(-1 < m_Operates.indexOf(pOperate)) {
+    if(m_Operates.contains(pOperate)) {
         if(m_pView)
             m_pView->SetCurrentView(pOperate->GetViewer());
         return 0;
@@ -944,7 +944,7 @@ int MainWindow::Start(COperate *pOperate, bool set, QString szFile)
                         this, SLOT(slotViewerFocusIn(QWidget*)));
         Q_ASSERT(check);
     }
-    m_Operates.push_back(pOperate);
+    m_Operates.insert(pOperate);
     StartTimer();
 
     m_pFrmActive->slotLoad();
@@ -1058,7 +1058,7 @@ void MainWindow::slotFinished()
         if(p == pOperate)
         {
             m_pView->RemoveView(p->GetViewer());
-            m_Operates.removeAll(p);
+            m_Operates.remove(p);
             m_Manager.DeleteOperate(p);
             m_pFrmActive->slotLoad();
             m_pFrmActive->slotViewChanged(m_pView->GetCurrentView());

App/Client/mainwindow.h

@@ -69,7 +69,7 @@ private Q_SLOTS:
     void slotStartByType();
 private:
     CManager m_Manager;
-    QVector<COperate*> m_Operates;
+    QSet<COperate*> m_Operates;
     QMap<CPlugin::TYPE, QMenu*> m_MenuStartByType;
 
 private Q_SLOTS: