Differential D4232 Diff 10406 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;
38​class QPushButton;
32 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;
40 47​
48​ /** Container for controls that select memory range.
49​ *
50​ The memory range selection is embedded into memory view widget,
51​ it's not a standalone dialog. However, we want to have easy way
52​ to hide/show all controls, so we group them in this class.
53​ */
54​ class MemoryRangeSelector : public QWidget
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…
55​ {
56​ Q_OBJECT
57​ MemoryRangeSelector(QWidget* parent);
58​ private:
mwolffUnsubmitted
Done

de-indent from here on below

mwolff: de-indent from here on below
59​ QLineEdit* startAddressLineEdit;
60​ QLineEdit* amountLineEdit;
61​ QPushButton* okButton;
62​ QPushButton* cancelButton;
63​
64​ friend class MemoryView;
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?
65​ };
66​
67​
41 class MemoryViewerWidget : public QWidget 68​ class MemoryViewerWidget : public QWidget
42 { 69​ {
43 Q_OBJECT 70​ Q_OBJECT
44 public: 71​ public:
45 explicit MemoryViewerWidget(CppDebuggerPlugin* plugin, QWidget* parent = nullptr); 72​ explicit MemoryViewerWidget(CppDebuggerPlugin* plugin, QWidget* parent = nullptr);
46 73​
47 public Q_SLOTS: 74​ public Q_SLOTS:
48 /** Adds a new memory view. */ 75​ /** Adds a new memory view. */
49 void slotAddMemoryView(); 76​ void slotAddMemoryView();
50 77​
51 Q_SIGNALS: 78​ Q_SIGNALS:
52 void requestRaise(); 79​ void requestRaise();
53 80​
54 81​
55 private Q_SLOTS: 82​ private Q_SLOTS:
56 void slotChildCaptionChanged(const QString& caption); 83​ void slotChildCaptionChanged(const QString& caption);
57 void slotChildDestroyed(QObject* child); 84​ void slotChildDestroyed(QObject* child);
58 85​
59 private: // Data 86​ private: // Data
60 QToolBox* toolBox_; 87​ QToolBox* m_toolBox;
61 QList<MemoryView*> memoryViews_; 88​ QList<MemoryView*> m_memoryViews;
62 }; 89​ };
63 90​
64 class MemoryView : public QWidget 91​ class MemoryView : public QWidget
65 { 92​ {
66 Q_OBJECT 93​ Q_OBJECT
67 public: 94​ public:
68 explicit MemoryView(QWidget* parent); 95​ explicit MemoryView(QWidget* parent);
69 96​
70 void debuggerStateChanged(DBGStateFlags state); 97​ void debuggerStateChanged(DBGStateFlags state);
71 98​
72 Q_SIGNALS: 99​ Q_SIGNALS:
73 void captionChanged(const QString& caption); 100​ void captionChanged(const QString& caption);
74 101​
75 private: // Callbacks 102​ private: // Callbacks
76 void sizeComputed(const QString& value); 103​ void sizeComputed(const QString& value);
77 104​
78 void memoryRead(const MI::ResultRecord& r); 105​ void memoryRead(const MI::ResultRecord& r);
79 106​
107​ // Returns true is we successfully created the memoryView, and
108​ // can work.
109​ bool isOk() const;
110​
80 private Q_SLOTS: 111​ private Q_SLOTS:
81 void memoryEdited(int start, int end); 112​ void memoryEdited(int start, int end);
82 /** Informs the view about changes in debugger state. 113​ /** Informs the view about changes in debugger state.
83 * Allows view to disable itself when debugger is not running. */ 114​ * Allows view to disable itself when debugger is not running. */
84 void slotStateChanged(DBGStateFlags oldState, DBGStateFlags newState); 115​ void slotStateChanged(DBGStateFlags oldState, DBGStateFlags newState);
85 116​
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. 117​ /** Invoked when user has changed memory range.
95 Gets memory for the new range. */ 118​ Gets memory for the new range. */
96 void slotChangeMemoryRange(); 119​ void slotChangeMemoryRange();
97 void slotHideRangeDialog(); 120​ void slotHideRangeDialog();
98 void slotEnableOrDisable(); 121​ void slotEnableOrDisable();
99 122​
100 private: // QWidget overrides 123​ private: // QWidget overrides
101 void contextMenuEvent(QContextMenuEvent* e) override; 124​ void contextMenuEvent(QContextMenuEvent* e) override;
102 125​
103 private: ​
104 void initWidget(); 126​ void initWidget();
105 127​
106 private: 128​ MemoryRangeSelector* m_rangeSelector;
107 class MemoryRangeSelector* rangeSelector_; 129​ Okteta::ByteArrayModel *m_memViewModel;
108 QWidget* khexedit2_widget; 130​ Okteta::ByteArrayColumnView *m_memViewView;
109 131​
110 uint amount_; 132​ uint m_memAmount;
111 quintptr start_; 133​ quintptr m_memStart;
112 QString startAsString_, amountAsString_; 134​ QString m_memStartStr, m_memAmountStr;
113 char* data_; 135​ char* m_memData;
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…
136​ int m_debuggerState;
114 137​
115 int debuggerState_; ​
116 private slots: 138​ private slots:
117 void currentSessionChanged(KDevelop::IDebugSession* session); 139​ void currentSessionChanged(KDevelop::IDebugSession* session);
118 }; 140​ };
119 141​
120} // end of namespace GDB 142​} // end of namespace GDB
121} // end of namespace KDevMI 143​} // end of namespace KDevMI
122 144​
123#endif 145​#endif