GUI: refactor StdSearchListView to allow passing a custom StdTableSearchList

Author: mrexodia

src/gui/Src/BasicView/StdSearchListView.cpp

@@ -1,46 +1,12 @@
 #include "StdSearchListView.h"
-#include "StdTable.h"
-
-class StdTableSearchList : public AbstractSearchList
-{
-public:
-    friend class StdSearchListView;
-
-    StdTableSearchList() : mList(new StdTable()), mSearchList(new StdTable()) { }
-    ~StdTableSearchList() {delete mList; delete mSearchList; }
-
-    void lock() override { }
-    void unlock() override { }
-    AbstractStdTable* list() const override { return mList; }
-    AbstractStdTable* searchList() const override { return mSearchList; }
-
-    void filter(const QString & filter, FilterType type, int startColumn) override
-    {
-        mSearchList->setRowCount(0);
-        int rows = mList->getRowCount();
-        int columns = mList->getColumnCount();
-        for(int i = 0, j = 0; i < rows; i++)
-        {
-            if(rowMatchesFilter(filter, type, i, startColumn))
-            {
-                mSearchList->setRowCount(j + 1);
-                for(int k = 0; k < columns; k++)
-                {
-                    mSearchList->setCellContent(j, k, mList->getCellContent(i, k));
-                    mSearchList->setCellUserdata(j, k, mList->getCellUserdata(i, k));
-                }
-                j++;
-            }
-        }
-    }
-
-private:
-    StdTable* mList;
-    StdTable* mSearchList;
-};
 
 StdSearchListView::StdSearchListView(QWidget* parent, bool enableRegex, bool enableLock)
-    : SearchListView(parent, mSearchListData = new StdTableSearchList(), enableRegex, enableLock)
+    : StdSearchListView(parent, enableRegex, enableLock, new StdTableSearchList())
+{
+}
+
+StdSearchListView::StdSearchListView(QWidget* parent, bool enableRegex, bool enableLock, StdTableSearchList* tableSearchList)
+    : SearchListView(parent, mSearchListData = tableSearchList, enableRegex, enableLock)
 {
     setAddressColumn(0);
 }

src/gui/Src/BasicView/StdSearchListView.h

@@ -2,15 +2,14 @@
 #define STDSEARCHLISTVIEW_H
 
 #include "SearchListView.h"
-#include "StdTable.h"
-
-class StdTableSearchList;
+#include "StdTableSearchList.h"
 
 class StdSearchListView : public SearchListView
 {
     Q_OBJECT
 public:
     StdSearchListView(QWidget* parent, bool enableRegex, bool enableLock);
+    StdSearchListView(QWidget* parent, bool enableRegex, bool enableLock, StdTableSearchList* tableSearchList);
     ~StdSearchListView() override;
 
     void setInternalTitle(const QString & title);

src/gui/Src/BasicView/StdTableSearchList.cpp

@@ -0,0 +1,21 @@
+#include "StdTableSearchList.h"
+
+void StdTableSearchList::filter(const QString & filter, FilterType type, int startColumn)
+{
+    mSearchList->setRowCount(0);
+    int rows = mList->getRowCount();
+    int columns = mList->getColumnCount();
+    for(int i = 0, j = 0; i < rows; i++)
+    {
+        if(rowMatchesFilter(filter, type, i, startColumn))
+        {
+            mSearchList->setRowCount(j + 1);
+            for(int k = 0; k < columns; k++)
+            {
+                mSearchList->setCellContent(j, k, mList->getCellContent(i, k));
+                mSearchList->setCellUserdata(j, k, mList->getCellUserdata(i, k));
+            }
+            j++;
+        }
+    }
+}

src/gui/Src/BasicView/StdTableSearchList.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "AbstractSearchList.h"
+#include "StdTable.h"
+
+class StdTableSearchList : public AbstractSearchList
+{
+public:
+    friend class StdSearchListView;
+
+    StdTableSearchList() : StdTableSearchList(new StdTable(), new StdTable()) { }
+    StdTableSearchList(StdTable* list, StdTable* searchList) : mList(list), mSearchList(searchList) { }
+    ~StdTableSearchList() { delete mList; delete mSearchList; }
+
+    void lock() override { }
+    void unlock() override { }
+    AbstractStdTable* list() const override { return mList; }
+    AbstractStdTable* searchList() const override { return mSearchList; }
+
+    void filter(const QString & filter, FilterType type, int startColumn) override;
+
+private:
+    StdTable* mList;
+    StdTable* mSearchList;
+};

src/gui/x64dbg.pro

@@ -183,7 +183,8 @@ SOURCES += \
     Src/Gui/MultiItemsSelectWindow.cpp \
     Src/BasicView/AbstractStdTable.cpp \
     Src/Gui/ZehSymbolTable.cpp \
-    Src/BasicView/StdSearchListView.cpp
+    Src/BasicView/StdSearchListView.cpp \
+    Src/BasicView/StdTableSearchList.cpp
 
 
 HEADERS += \
@@ -303,7 +304,8 @@ HEADERS += \
     Src/Gui/ZehSymbolTable.h \
     Src/BasicView/AbstractSearchList.h \
     Src/BasicView/StdSearchListView.h \
-    Src/Gui/FileLines.h
+    Src/Gui/FileLines.h \
+    Src/BasicView/StdTableSearchList.h
 
 
 FORMS += \