Merge branch 'develop'

[clinton/Virtual-Jaguar-Rx.git] / src / debugger / localbrowser.h

diff --git a/src/debugger/localbrowser.h b/src/debugger/localbrowser.h
index 056fd73..249350f 100644 (file)
--- a/src/debugger/localbrowser.h
+++ b/src/debugger/localbrowser.h
@@ -7,39 +7,30 @@
 #ifndef __LOCALBROWSER_H__\r
 #define __LOCALBROWSER_H__\r
 \r
-//#define LOCAL_LAYOUTTEXTS                                            // Use a layout with just texts\r
-//#define LOCAL_SUPPORTARRAY                                           // Support array\r
-//#define LOCAL_SUPPORTSTRUCTURE                                       // Support structure\r
+//#define LOCAL_FONTS                                                          // Support for fonts modifications\r
 \r
-#include <QtWidgets>\r
+#include <QtWidgets/QtWidgets>\r
 #include <stdint.h>\r
 
 // Error code definitions\r
 #define        LOCAL_NOERROR           0x00\r
-#define        LOCAL_ERROR                     0x80
 #define        LOCAL_WARNING           0x40\r
+#define        LOCAL_ERROR                     0x80
 #define        LOCAL_NOLOCALS          (0x01 | LOCAL_WARNING)\r
 \r
-\r
 // \r
 class LocalBrowserWindow: public QWidget\r
 {\r
        Q_OBJECT\r
 \r
        //\r
-       typedef struct WatchInfo\r
+       typedef struct LocalInfo\r
        {\r
-               size_t Op;\r
                size_t Adr;\r
-               int Offset;\r
-               size_t TypeTag;\r
-               size_t TypeEncoding;\r
-               size_t TypeByteSize;\r
-               char *PtrVariableName;\r
-               char *PtrVariableBaseTypeName;\r
                char *PtrCPURegisterName;\r
+               void *PtrVariable;\r
        }\r
-       S_WatchInfo;\r
+       S_LocalInfo;\r
 \r
        public:\r
                LocalBrowserWindow(QWidget *parent = 0);\r
@@ -50,17 +41,15 @@ class LocalBrowserWindow: public QWidget
                bool UpdateInfos(void);\r
 \r
        protected:\r
+               QList<QStandardItem *> prepareRow(void* Info);\r
+               void setValueRow(QStandardItem *Row, size_t Adr, char* Value, void* Info);\r
                void keyPressEvent(QKeyEvent *);\r
 \r
        private:\r
                QVBoxLayout *layout;\r
-#ifdef LOCAL_LAYOUTTEXTS\r
-               QTextBrowser *text;\r
-#else\r
-               QTableView *TableView;\r
+               QTreeView *TableView;\r
                QStandardItemModel *model;\r
-#endif\r
-               WatchInfo *LocalInfo;\r
+               S_LocalInfo *LocalInfo;\r
                QStatusBar *statusbar;\r
                size_t NbLocal;\r
                char *FuncName;\r