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

Update include for Qt5 #1853

Merged
merged 1 commit into from
Sep 23, 2012
Merged

Update include for Qt5 #1853

merged 1 commit into from
Sep 23, 2012

Conversation

fanquake
Copy link
Member

Update

#include <QtGui/QWidget>

to

#include <QWidget>

@@ -2,7 +2,7 @@
#include "macdockiconhandler.h"

#include <QtGui/QMenu>
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't we do the same for QMenu?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think so. The reason the QWidget gets changed is because in Qt 5 compared to Qt 4 widgets have been split from the QtGui module into a new QtWidgets module.

See here http://www.kdab.com/porting-from-qt-4-to-qt-5/ under fixing up includes.

Copy link

Choose a reason for hiding this comment

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

As I understand it @fanquake should be right here.

Copy link
Member

Choose a reason for hiding this comment

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

Hmm but in other places in the source code we always simply use #include <QMenu>. So I guess it would be more consistent.

Update Qmenu include

This is to be more consistent with the rest of the source

Update Qt Includes
@fanquake
Copy link
Member Author

Fixed the other include and merged into one commit.

@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/ea9eaf9dec203e40d8a88914ca04ae1a8b705128 for binaries and test log.

laanwj added a commit that referenced this pull request Sep 23, 2012
@laanwj laanwj merged commit 49b09ec into bitcoin:master Sep 23, 2012
@fanquake fanquake deleted the qt-include branch May 12, 2016 14:08
KolbyML pushed a commit to KolbyML/bitcoin that referenced this pull request Dec 5, 2020
…and members

5a4e416 Remove unused mapRequest tracking. (furszy)
aa25d32 miner: removing a not needed block requests tracking. (furszy)
087a4d7 GUI: removing unused TransactionDesc file (static toHTML function is not being called anymore). (furszy)
8a6402a GUI: transactionTablemodel, remove unused LongDescriptionRole. (furszy)

Pull request description:

  Going further with the cleanup, have removed several unused and not needed functions and files from the GUI and the wallet. The `LongDescriptionRole` (which was calling to the `TransactionDesc` class) is not needed anymore, just a remanent of the previous GUI. Then have gone down the rabbit hole and cleaned the methods and fields that were connected to the removed function and currently are not needed anymore.

ACKs for top commit:
  Fuzzbawls:
    utACK 5a4e416
  random-zebra:
    utACK 5a4e416

Tree-SHA512: 324ba3b6acc95c1bc97359084e04e11be58c0e98edea42211b61c0e2632e5e6253d30bfe2ceea78cd5bb1981a588d2dce2d6a06661475c30f116c15c8bb4ec2e
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants