From 8989de83625174b98b493422eb69427468d99ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sun, 19 Nov 2017 18:49:29 +0100
Subject: [PATCH] Small fix for older Qt versions

---
 src/menus/DisassemblyContextMenu.cpp | 17 ++++++++---------
 src/menus/DisassemblyContextMenu.h   | 10 ++++++----
 src/widgets/DisassemblyWidget.cpp    |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
index e4cb9b0b..ff092688 100644
--- a/src/menus/DisassemblyContextMenu.cpp
+++ b/src/menus/DisassemblyContextMenu.cpp
@@ -7,15 +7,14 @@
 #include <QtCore>
 #include <QShortcut>
 
-DisassemblyContextMenu::DisassemblyContextMenu(RVA offset, QWidget *parent) :
-    QMenu(parent),
-    offset(offset)
-{
-    init();
-}
-
-DisassemblyContextMenu::DisassemblyContextMenu(QWidget*parent)
-    :   QMenu(parent)
+DisassemblyContextMenu::DisassemblyContextMenu(QWidget *parent)
+    :   QMenu(parent),
+        offset(0),
+        actionAddComment(this),
+        actionAddFlag(this),
+        actionRename(this),
+        actionXRefs(this),
+        actionDisplayOptions(this)
 {
     init();
 }
diff --git a/src/menus/DisassemblyContextMenu.h b/src/menus/DisassemblyContextMenu.h
index e347cfce..9cbe2267 100644
--- a/src/menus/DisassemblyContextMenu.h
+++ b/src/menus/DisassemblyContextMenu.h
@@ -5,13 +5,14 @@
 #include <QMenu>
 #include <QKeySequence>
 
-class DisassemblyContextMenu : public QMenu {
+class DisassemblyContextMenu : public QMenu
+{
 Q_OBJECT
+
 public:
-    DisassemblyContextMenu(RVA offset, QWidget *parent = nullptr);
+    DisassemblyContextMenu(QWidget *parent = nullptr);
     ~DisassemblyContextMenu() = default;
 
-    DisassemblyContextMenu(QWidget *parent = nullptr);
 
 public slots:
     void setOffset(RVA offset);
@@ -30,8 +31,9 @@ private:
     QKeySequence getRenameSequence() const;
     QKeySequence getXRefSequence() const;
     QKeySequence getDisplayOptionsSequence() const;
-private:
+
     RVA offset;
+
     QAction actionAddComment;
     QAction actionAddFlag;
     QAction actionRename;
diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
index 77fdb7ee..dd4e7398 100644
--- a/src/widgets/DisassemblyWidget.cpp
+++ b/src/widgets/DisassemblyWidget.cpp
@@ -485,7 +485,7 @@ void DisassemblyTextEdit::scrollContentsBy(int dx, int dy)
     }
 }
 
-void DisassemblyTextEdit::keyPressEvent(QKeyEvent *event)
+void DisassemblyTextEdit::keyPressEvent(QKeyEvent */*event*/)
 {
     //QPlainTextEdit::keyPressEvent(event);
 }