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

[Qt] minor optimisations in peertablemodel #6317

Merged
merged 1 commit into from Sep 16, 2015
Merged

Conversation

@Diapolo
Copy link

Diapolo commented Jun 21, 2015

  • remove an unneeded include of net.h in peertablemodel.cpp
  • add const after size() in PeerTablePriv
  • remove 2x unneeded else in functions
  • replace a (int) typecast by (QVariant) to use Qt style
@paveljanik
Copy link
Contributor

paveljanik commented Jun 22, 2015

Can you please remove { and } in a one-line ifs?
utACK

@Diapolo
Copy link
Author

Diapolo commented Jun 22, 2015

@paveljanik @laanwj most of the time prefers { and } even for one-line ifs :).

@jonasschnelli
Copy link
Member

jonasschnelli commented Jun 23, 2015

I agree with @paveljanik: most one line ifs are without brackets and i think this is according to our code style / clang style.

@Diapolo
Copy link
Author

Diapolo commented Jun 23, 2015

@paveljanik @jonasschnelli Changed into one-line ifs :).

@laanwj laanwj added the GUI label Jul 2, 2015
@Diapolo
Copy link
Author

Diapolo commented Jul 6, 2015

@paveljanik @jonasschnelli @laanwj Do I get some ACKs, this should be easy to merge :).

@paveljanik
Copy link
Contributor

paveljanik commented Jul 6, 2015

utACK
I think such changes should go to trivial...

@jonasschnelli
Copy link
Member

jonasschnelli commented Jul 6, 2015

utACK

@jonasschnelli
Copy link
Member

jonasschnelli commented Jul 14, 2015

ACK

@Diapolo
Copy link
Author

Diapolo commented Jul 29, 2015

@laanwj Can you please merge this trivial stuff :)?

- remove an unneeded include of net.h in peertablemodel.cpp
- add const after size() in PeerTablePriv
- remove 2x unneeded else in functions
- replace a (int) typecast by (QVariant) to use Qt style
- remove unneeded include of peertablemodel.h from rpcconsole.cpp
@Diapolo
Copy link
Author

Diapolo commented Aug 10, 2015

@laanwj Ping once more.

@Diapolo
Copy link
Author

Diapolo commented Sep 9, 2015

@jonasschnelli IMHO, if we still support the GUI, we need another person wo is willing or able to merge GUI pulls... it's currently frustrating!

@MarcoFalke
Copy link
Member

MarcoFalke commented Sep 10, 2015

merge GUI pulls

It seems cosmetic-only changes to the source code usually get rejected? (#6511)

Still, utACK from me.

@jgarzik jgarzik merged commit 92684bb into bitcoin:master Sep 16, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jgarzik pushed a commit that referenced this pull request Sep 16, 2015
Jeff Garzik
@Diapolo Diapolo deleted the Diapolo:peertablemodel branch Sep 16, 2015
str4d added a commit to str4d/zcash that referenced this pull request Jan 31, 2017
Zcash: Also include AC_HELP_STRING -> AS_HELP_STRING (ostensibly from merging
bitcoin/bitcoin#6317 but the change only occurs in the merge commit
ca5e2a1, not the PR itself).
str4d added a commit to str4d/zcash that referenced this pull request Feb 8, 2017
Zcash: Also include AC_HELP_STRING -> AS_HELP_STRING (ostensibly from merging
bitcoin/bitcoin#6317 but the change only occurs in the merge commit
ca5e2a1, not the PR itself).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.