Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge bitcoin#18914, #13306, #16424, #13899, #17486, #17880, #18145, #18843, #16710: split warnings out of CXXFLAGS, add more flags #4196

Merged
merged 9 commits into from
Jun 23, 2021

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Jun 15, 2021

Should take care of this warning generated on macOS Mojave

In file included from qt/moc_signverifymessagedialog.cpp:8:
./qt/signverifymessagedialog.h:36:10: warning: 'eventFilter' overrides a member function but is not marked 'override'
      [-Winconsistent-missing-override]
    bool eventFilter(QObject *object, QEvent *event);
         ^
/Users/localhost/Projects/dash/depends/x86_64-apple-darwin18.7.0/include/QtWidgets/qdialog.h:111:10: note: overridden virtual function is here
    bool eventFilter(QObject *, QEvent *) override;
         ^

@PastaPastaPasta
Copy link
Member

Better to backport bitcoin#18914 to avoid merge conflicts

@PastaPastaPasta PastaPastaPasta marked this pull request as draft June 15, 2021 16:42
@kwvg kwvg changed the title qt: mark eventFilter as 'override' to match virtual function merge bitcoin#18914: Apply override specifier consistently Jun 16, 2021
@kwvg kwvg marked this pull request as ready for review June 16, 2021 08:36
@UdjinM6 UdjinM6 added this to the 17.1 milestone Jun 16, 2021
@kwvg kwvg changed the title merge bitcoin#18914: Apply override specifier consistently merge bitcoin#18914, #16710: Apply override specifier consistently Jun 16, 2021
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff --git a/src/qt/qrdialog.h b/src/qt/qrdialog.h
index 46d9cbcb1a..3c503fe1e3 100644
--- a/src/qt/qrdialog.h
+++ b/src/qt/qrdialog.h
@@ -35,8 +35,8 @@ public Q_SLOTS:
     void copyImage();
 
 protected:
-    virtual void mousePressEvent(QMouseEvent *event);
-    virtual void contextMenuEvent(QContextMenuEvent *event);
+    virtual void mousePressEvent(QMouseEvent *event) override;
+    virtual void contextMenuEvent(QContextMenuEvent *event) override;
 
 private:
     QMenu *contextMenu;

@kwvg kwvg force-pushed the override branch 2 times, most recently from 93b76fb to 31e192f Compare June 17, 2021 05:54
@kwvg kwvg changed the title merge bitcoin#18914, #16710: Apply override specifier consistently merge bitcoin#18914, #13306, #16424, #13899, #17486, #17880, #18145, #18843, #16710: Apply override specifier consistently Jun 17, 2021
@kwvg kwvg changed the title merge bitcoin#18914, #13306, #16424, #13899, #17486, #17880, #18145, #18843, #16710: Apply override specifier consistently merge bitcoin#18914, #13306, #16424, #13899, #17486, #17880, #18145, #18843, #16710: split warnings out of CXXFLAGS, add more flags Jun 17, 2021
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 June 22, 2021 17:14
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

13899 is incomplete but it's fine, can be fixed later (there are quite a few other things to fix when compiled with these new flags)

ACK

@UdjinM6 UdjinM6 merged commit 988fa6a into dashpay:develop Jun 23, 2021
@UdjinM6 UdjinM6 mentioned this pull request Jun 29, 2021
@kwvg kwvg deleted the override branch July 18, 2023 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants