X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fgui%2FMainwindow.hxx;h=ba0d8b4944529138ff78fbf2e9b995133c677dab;hb=1c0f4550bed81773ad34d190508bd49616264a38;hp=8cf1fadb25cfb0f707c4d207dd217269e56050a3;hpb=32e87746db981882b95aceddde79ef12034a3405;p=frida%2Ffrida.git

diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index 8cf1fad..ba0d8b4 100644
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -3,7 +3,6 @@
 
 #include <memory>
 #include <map>
-#include <set>
 
 #include <QTextEdit>
 #include <QPushButton>
@@ -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();
@@ -43,15 +47,13 @@ private:
 	QAction *saveAction;
 
 	std::map<uint64_t, BasicBlockWidget*> blocks;
-	std::map<QListWidgetItem*, QWidget*> objects_list;
+	std::map<uint64_t, Function*> functions;
+	std::map<QListWidgetItem*, FunctionWidget*> objects_list;
 	std::map<uint64_t, QListWidgetItem*> objects_list_by_address;
-	std::set<Function*> functions;
-	InformationManager* manager;
 
+	InformationManager* manager;
 	log4cxx::LoggerPtr logger;
-public Q_SLOTS:
-	void switchMainPlaneToAddress(uint64_t);
-	void requestNewFunctionByAddress(uint64_t address);
+
 private Q_SLOTS:
 	void quit();
 	void open();
@@ -59,7 +61,7 @@ private Q_SLOTS:
 	void switchMainPlane(int);
 	void showListContextMenu(const QPoint&);
 	void requestNewFunction();
-	void renameFunction(QListWidgetItem * item);
+	void renameFunction(Function* function);
 };
 
 #endif /* INCLUDE__Mainwindow_hxx_ */