winstack.h (kdbg-3.0.0) | : | winstack.h (kdbg-3.0.1) | ||
---|---|---|---|---|
skipping to change at line 35 | skipping to change at line 35 | |||
class FindDialog : public QDialog | class FindDialog : public QDialog | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
FindDialog(); | FindDialog(); | |||
~FindDialog(); | ~FindDialog(); | |||
bool caseSensitive() const { return m_caseCheck.isChecked(); } | bool caseSensitive() const { return m_caseCheck.isChecked(); } | |||
QString searchText() const { return m_searchText.text(); } | QString searchText() const { return m_searchText.text(); } | |||
virtual void done(int result); | void done(int result) override; | |||
QLineEdit m_searchText; | QLineEdit m_searchText; | |||
QCheckBox m_caseCheck; | QCheckBox m_caseCheck; | |||
QPushButton m_buttonForward; | QPushButton m_buttonForward; | |||
QPushButton m_buttonBackward; | QPushButton m_buttonBackward; | |||
QPushButton m_buttonClose; | QPushButton m_buttonClose; | |||
signals: | signals: | |||
void closed(); | void closed(); | |||
protected: | protected: | |||
virtual void closeEvent(QCloseEvent* ev); | void closeEvent(QCloseEvent* ev) override; | |||
QVBoxLayout m_layout; | QVBoxLayout m_layout; | |||
QHBoxLayout m_buttons; | QHBoxLayout m_buttons; | |||
}; | }; | |||
class WinStack : public QTabWidget | class WinStack : public QTabWidget | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
WinStack(QWidget* parent); | WinStack(QWidget* parent); | |||
virtual ~WinStack(); | ~WinStack(); | |||
/** | /** | |||
* Slot activate also looks in this directory when the specified file is | * Slot activate also looks in this directory when the specified file is | |||
* a relative path. | * a relative path. | |||
*/ | */ | |||
void setExtraDirectory(const QString& dir) { m_lastOpenDir = dir; } | void setExtraDirectory(const QString& dir) { m_lastOpenDir = dir; } | |||
void activateFile(const QString& fileName); | void activateFile(const QString& fileName); | |||
bool activeLine(QString& filename, int& lineNo); | bool activeLine(QString& filename, int& lineNo); | |||
bool activeLine(QString& filename, int& lineNo, DbgAddr& address); | bool activeLine(QString& filename, int& lineNo, DbgAddr& address); | |||
bool hasWindows() const { return count() > 0; } | bool hasWindows() const { return count() > 0; } | |||
QString activeFileName() const; | QString activeFileName() const; | |||
SourceWindow* activeWindow() const; | SourceWindow* activeWindow() const; | |||
SourceWindow* windowAt(int i) const; | SourceWindow* windowAt(int i) const; | |||
virtual QSize sizeHint() const; | QSize sizeHint() const override; | |||
signals: | signals: | |||
void toggleBreak(const QString&, int, const DbgAddr&, bool); | void toggleBreak(const QString&, int, const DbgAddr&, bool); | |||
void enadisBreak(const QString&, int, const DbgAddr&); | void enadisBreak(const QString&, int, const DbgAddr&); | |||
void newFileLoaded(); | void newFileLoaded(); | |||
void initiateValuePopup(const QString&); | void initiateValuePopup(const QString&); | |||
void disassemble(const QString&, int); | void disassemble(const QString&, int); | |||
void setTabWidth(int numChars); | void setTabWidth(int numChars); | |||
void moveProgramCounter(const QString&, int, const DbgAddr&); | void moveProgramCounter(const QString&, int, const DbgAddr&); | |||
skipping to change at line 114 | skipping to change at line 114 | |||
// Shows the disassembled code at the location given by file and lineNo | // Shows the disassembled code at the location given by file and lineNo | |||
void slotDisassembled(const QString& fileName, int lineNo, | void slotDisassembled(const QString& fileName, int lineNo, | |||
const std::list<DisassembledCode>& disass); | const std::list<DisassembledCode>& disass); | |||
// Updates line items after expanding/collapsing disassembled code | // Updates line items after expanding/collapsing disassembled code | |||
void slotExpandCollapse(int lineNo); | void slotExpandCollapse(int lineNo); | |||
protected: | protected: | |||
bool activatePath(QString pathname, int lineNo, const DbgAddr& address); | bool activatePath(QString pathname, int lineNo, const DbgAddr& address); | |||
virtual bool activateWindow(SourceWindow* fw, int lineNo, const DbgAddr& add ress); /* -1 doesnt change line */ | virtual bool activateWindow(SourceWindow* fw, int lineNo, const DbgAddr& add ress); /* -1 doesnt change line */ | |||
virtual void contextMenuEvent(QContextMenuEvent* e); | void contextMenuEvent(QContextMenuEvent* e) override; | |||
virtual bool event(QEvent* event); | bool event(QEvent* event) override; | |||
void setPC(bool set, const QString& fileName, int lineNo, | void setPC(bool set, const QString& fileName, int lineNo, | |||
const DbgAddr& address, int frameNo); | const DbgAddr& address, int frameNo); | |||
SourceWindow* findByFileName(const QString& fileName) const; | SourceWindow* findByFileName(const QString& fileName) const; | |||
QString m_lastOpenDir; /* where user opened last file */ | QString m_lastOpenDir; /* where user opened last file */ | |||
// program counter | // program counter | |||
QString m_pcFile; | QString m_pcFile; | |||
int m_pcLine; /* -1 if no PC */ | int m_pcLine; /* -1 if no PC */ | |||
QString m_pcAddress; /* exact address of PC */ | QString m_pcAddress; /* exact address of PC */ | |||
int m_pcFrame; | int m_pcFrame; | |||
End of changes. 5 change blocks. | ||||
6 lines changed or deleted | 6 lines changed or added |