Small fix for older Qt versions

This commit is contained in:
Florian Märkl 2017-11-19 18:49:29 +01:00
parent 5a0bf9c938
commit 8989de8362
3 changed files with 15 additions and 14 deletions

View File

@ -7,15 +7,14 @@
#include <QtCore> #include <QtCore>
#include <QShortcut> #include <QShortcut>
DisassemblyContextMenu::DisassemblyContextMenu(RVA offset, QWidget *parent) : DisassemblyContextMenu::DisassemblyContextMenu(QWidget *parent)
QMenu(parent), : QMenu(parent),
offset(offset) offset(0),
{ actionAddComment(this),
init(); actionAddFlag(this),
} actionRename(this),
actionXRefs(this),
DisassemblyContextMenu::DisassemblyContextMenu(QWidget*parent) actionDisplayOptions(this)
: QMenu(parent)
{ {
init(); init();
} }

View File

@ -5,13 +5,14 @@
#include <QMenu> #include <QMenu>
#include <QKeySequence> #include <QKeySequence>
class DisassemblyContextMenu : public QMenu { class DisassemblyContextMenu : public QMenu
{
Q_OBJECT Q_OBJECT
public: public:
DisassemblyContextMenu(RVA offset, QWidget *parent = nullptr); DisassemblyContextMenu(QWidget *parent = nullptr);
~DisassemblyContextMenu() = default; ~DisassemblyContextMenu() = default;
DisassemblyContextMenu(QWidget *parent = nullptr);
public slots: public slots:
void setOffset(RVA offset); void setOffset(RVA offset);
@ -30,8 +31,9 @@ private:
QKeySequence getRenameSequence() const; QKeySequence getRenameSequence() const;
QKeySequence getXRefSequence() const; QKeySequence getXRefSequence() const;
QKeySequence getDisplayOptionsSequence() const; QKeySequence getDisplayOptionsSequence() const;
private:
RVA offset; RVA offset;
QAction actionAddComment; QAction actionAddComment;
QAction actionAddFlag; QAction actionAddFlag;
QAction actionRename; QAction actionRename;

View File

@ -485,7 +485,7 @@ void DisassemblyTextEdit::scrollContentsBy(int dx, int dy)
} }
} }
void DisassemblyTextEdit::keyPressEvent(QKeyEvent *event) void DisassemblyTextEdit::keyPressEvent(QKeyEvent */*event*/)
{ {
//QPlainTextEdit::keyPressEvent(event); //QPlainTextEdit::keyPressEvent(event);
} }