Change from QListWidget to QTreeWidget

[frida/frida.git] / src / gui / Mainwindow.hxx

diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index 8cf1fadb25cfb0f707c4d207dd217269e56050a3..a3bd4bdfa88ff354c0ee09a557ceb4d6d8c668c3 100644 (file)
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -3,12 +3,11 @@
 
 #include <memory>
 #include <map>
-#include <set>
 
 #include <QTextEdit>
 #include <QPushButton>
 #include <QMainWindow>
-#include <QListWidget>
+#include <QTreeWidget>
 #include <QStackedWidget>
 
 #include <log4cxx/logger.h>
@@ -16,6 +15,7 @@
 class Disassembler;
 class Function;
 class InformationManager;
+class FunctionWidget;
 class BasicBlockWidget;
 class ScriptingDock;
 
@@ -24,6 +24,10 @@ class Mainwindow : public QMainWindow {
 public:
        Mainwindow(InformationManager* mgr);
 
+public Q_SLOTS:
+       void switchMainPlaneToAddress(uint64_t);
+       void requestNewFunctionByAddress(uint64_t address);
+
 private:
        void addFunction(Function* fun);
        void setGlobalHotkeys();
@@ -33,7 +37,7 @@ private:
        QMenu *fileMenu;
 
        QTabWidget * tabwidget;
-       QListWidget * listWidget;
+       QTreeWidget * listWidget;
        QStackedWidget * stackedWidget;
        QDockWidget * dockWidget;
        ScriptingDock * scripting;
@@ -43,23 +47,21 @@ private:
        QAction *saveAction;
 
        std::map<uint64_t, BasicBlockWidget*> blocks;
-       std::map<QListWidgetItem*, QWidget*> objects_list;
-       std::map<uint64_t, QListWidgetItem*> objects_list_by_address;
-       std::set<Function*> functions;
-       InformationManager* manager;
+       std::map<uint64_t, Function*> functions;
+       std::map<QTreeWidgetItem*, FunctionWidget*> objects_list;
+       std::map<uint64_t, QTreeWidgetItem*> objects_list_by_address;
 
+       InformationManager* manager;
        log4cxx::LoggerPtr logger;
-public Q_SLOTS:
-       void switchMainPlaneToAddress(uint64_t);
-       void requestNewFunctionByAddress(uint64_t address);
+
 private Q_SLOTS:
        void quit();
        void open();
        void save();
-       void switchMainPlane(int);
+       void switchMainPlane(QTreeWidgetItem* item);
        void showListContextMenu(const QPoint&);
        void requestNewFunction();
-       void renameFunction(QListWidgetItem * item);
+       void renameFunction(Function* function);
 };
 
 #endif /* INCLUDE__Mainwindow_hxx_ */