Differential D4232 Diff 10735 debuggers/gdb/memviewdlg.h

Changeset View

Standalone View

View Options

debuggers/gdb/memviewdlg.h

1/*************************************************************************** 1​/***************************************************************************
2 begin : Tue Oct 5 1999 2​ begin : Tue Oct 5 1999
3 copyright : (C) 1999 by John Birch 3​ copyright : (C) 1999 by John Birch
4 email : jbb@kdevelop.org 4​ email : jbb@kdevelop.org
5 ***************************************************************************/ 5​ ***************************************************************************/
6 6​
7/*************************************************************************** 7​/***************************************************************************
8 * * 8​ * *
9 * This program is free software; you can redistribute it and/or modify * 9​ * This program is free software; you can redistribute it and/or modify *
10 * it under the terms of the GNU General Public License as published by * 10​ * it under the terms of the GNU General Public License as published by *
11 * the Free Software Foundation; either version 2 of the License, or * 11​ * the Free Software Foundation; either version 2 of the License, or *
12 * (at your option) any later version. * 12​ * (at your option) any later version. *
13 * * 13​ * *
14 ***************************************************************************/ 14​ ***************************************************************************/
15 15​
16#ifndef _MEMVIEW_H_ 16​#ifndef MEMVIEW_H_
17#define _MEMVIEW_H_ 17​#define MEMVIEW_H_
18 18​
19#include "dbgglobal.h" 19​#include "dbgglobal.h"
20#include "mi/mi.h" 20​#include "mi/mi.h"
21 21​
22#include <QContextMenuEvent> 22​#include <QContextMenuEvent>
23#include <QWidget> 23​#include <QWidget>
24 24​
25​namespace Okteta {
26​class ByteArrayModel;
27​}
28​namespace Okteta {
29​class ByteArrayColumnView;
30​}
25 31​
26namespace KDevelop { 32​namespace KDevelop {
27class IDebugSession; 33​class IDebugSession;
28} 34​}
29 35​
30class QLineEdit; 36​class QLineEdit;
31class QToolBox; 37​class QToolBox;
32 38​
39​
33namespace KDevMI 40​namespace KDevMI
34{ 41​{
35namespace GDB 42​namespace GDB
36{ 43​{
37 class CppDebuggerPlugin; 44​ class CppDebuggerPlugin;
38 class MemoryView; 45​ class MemoryView;
39 class GDBController; 46​ class GDBController;
47​ class MemoryRangeSelector;
40 48​
41 class MemoryViewerWidget : public QWidget 49​ class MemoryViewerWidget : public QWidget
42 { 50​ {
43 Q_OBJECT 51​ Q_OBJECT
44 public: 52​ public:
45 explicit MemoryViewerWidget(CppDebuggerPlugin* plugin, QWidget* parent = nullptr); 53​ explicit MemoryViewerWidget(CppDebuggerPlugin* plugin, QWidget* parent = nullptr);
46 54​
47 public Q_SLOTS: 55​ public Q_SLOTS:
mwolffUnsubmitted
Done

all of this class is private, is that really your intention? I'd remove the friend below and keep it public like it used to be. also, moving it to the .cpp is better if at all possible, simply forward-declare it here

mwolff: all of this class is private, is that really your intention? I'd remove the friend below and…
48 /** Adds a new memory view. */ 56​ /** Adds a new memory view. */
49 void slotAddMemoryView(); 57​ void slotAddMemoryView();
50 58​
51 Q_SIGNALS: 59​ Q_SIGNALS:
mwolffUnsubmitted
Done

de-indent from here on below

mwolff: de-indent from here on below
52 void requestRaise(); 60​ void requestRaise();
53 61​
54 62​
55 private Q_SLOTS: 63​ private Q_SLOTS:
56 void slotChildCaptionChanged(const QString& caption); 64​ void slotChildCaptionChanged(const QString& caption);
57 void slotChildDestroyed(QObject* child); 65​ void slotChildDestroyed(QObject* child);
mwolffUnsubmitted
Done

maybe make it all public if you only access it from the view?

mwolff: maybe make it all public if you only access it from the view?
58 66​
59 private: // Data 67​ private: // Data
60 QToolBox* toolBox_; 68​ QToolBox* m_toolBox;
61 QList<MemoryView*> memoryViews_; 69​ QList<MemoryView*> m_memoryViews;
62 }; 70​ };
63 71​
64 class MemoryView : public QWidget 72​ class MemoryView : public QWidget
65 { 73​ {
66 Q_OBJECT 74​ Q_OBJECT
67 public: 75​ public:
68 explicit MemoryView(QWidget* parent); 76​ explicit MemoryView(QWidget* parent);
69 77​
70 void debuggerStateChanged(DBGStateFlags state); 78​ void debuggerStateChanged(DBGStateFlags state);
71 79​
72 Q_SIGNALS: 80​ Q_SIGNALS:
73 void captionChanged(const QString& caption); 81​ void captionChanged(const QString& caption);
74 82​
75 private: // Callbacks 83​ private: // Callbacks
76 void sizeComputed(const QString& value); 84​ void sizeComputed(const QString& value);
77 85​
78 void memoryRead(const MI::ResultRecord& r); 86​ void memoryRead(const MI::ResultRecord& r);
79 87​
88​ // Returns true is we successfully created the memoryView, and
89​ // can work.
90​ bool isOk() const;
91​
80 private Q_SLOTS: 92​ private Q_SLOTS:
81 void memoryEdited(int start, int end); 93​ void memoryEdited(int start, int end);
82 /** Informs the view about changes in debugger state. 94​ /** Informs the view about changes in debugger state.
83 * Allows view to disable itself when debugger is not running. */ 95​ * Allows view to disable itself when debugger is not running. */
84 void slotStateChanged(DBGStateFlags oldState, DBGStateFlags newState); 96​ void slotStateChanged(DBGStateFlags oldState, DBGStateFlags newState);
85 97​
86 private: ​
87 // Returns true is we successfully created the hexeditor, and so ​
88 // can work. ​
89 bool isOk() const; ​
90 ​
91 ​
92 ​
93 private Q_SLOTS: ​
94 /** Invoked when user has changed memory range. 98​ /** Invoked when user has changed memory range.
95 Gets memory for the new range. */ 99​ Gets memory for the new range. */
96 void slotChangeMemoryRange(); 100​ void slotChangeMemoryRange();
97 void slotHideRangeDialog(); 101​ void slotHideRangeDialog();
98 void slotEnableOrDisable(); 102​ void slotEnableOrDisable();
99 103​
100 private: // QWidget overrides 104​ private: // QWidget overrides
101 void contextMenuEvent(QContextMenuEvent* e) override; 105​ void contextMenuEvent(QContextMenuEvent* e) override;
102 106​
103 private: ​
104 void initWidget(); 107​ void initWidget();
105 108​
106 private: 109​ MemoryRangeSelector* m_rangeSelector;
107 class MemoryRangeSelector* rangeSelector_; 110​ Okteta::ByteArrayModel *m_memViewModel;
108 QWidget* khexedit2_widget; 111​ Okteta::ByteArrayColumnView *m_memViewView;
109 112​
110 uint amount_; 113​ quintptr m_memStart;
111 quintptr start_; 114​ QString m_memStartStr, m_memAmountStr;
112 QString startAsString_, amountAsString_; 115​ QByteArray m_memData;
113 char* data_; 116​ int m_debuggerState;
mwolffUnsubmitted
Done

I know, old code, but this is leaked. I cannot find a dtor that deletes it at least. Use a proper container class, like QByteArray or {Q,std::}vector<char>

mwolff: I know, old code, but this is leaked. I cannot find a dtor that deletes it at least. Use a…
114 117​
115 int debuggerState_; ​
116 private slots: 118​ private slots:
117 void currentSessionChanged(KDevelop::IDebugSession* session); 119​ void currentSessionChanged(KDevelop::IDebugSession* session);
118 }; 120​ };
119 121​
120} // end of namespace GDB 122​} // end of namespace GDB
121} // end of namespace KDevMI 123​} // end of namespace KDevMI
122 124​
123#endif 125​#endif