diff options
| author | fanquake <fanquake@gmail.com> | 2022-04-07 10:06:32 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-07 10:07:11 +0100 |
| commit | 5c80d9b72d6b15b172d004ee4be94569d410cdab (patch) | |
| tree | ee4dbf82cfa65e36b479a4f6ef719edce4289357 | |
| parent | d844b5e7999419de82bfe6cbc7c9f0b7848248ef (diff) | |
| parent | b72925e7cea11522aca65580c136dbacb2753e83 (diff) | |
Merge bitcoin/bitcoin#24790: lint: remove qt SIGNAL/SLOT lint
b72925e7cea11522aca65580c136dbacb2753e83 lint: remove qt SIGNAL/SLOT lint (fanquake)
Pull request description:
I think we are past the point where we need to lint for this, the CPU
can probably be better utilized.
ACKs for top commit:
laanwj:
ACK b72925e7cea11522aca65580c136dbacb2753e83
Tree-SHA512: 3da6e4811cdd16ff64c7e26f641f7b24f0405cc86cec36666de58691d447eca8662c924df31c6c60b3523c13590bdc62205a3237b1b1794dd8cdef35519309b3
| -rw-r--r-- | src/qt/bitcoingui.h | 2 | ||||
| -rwxr-xr-x | test/lint/lint-qt.sh | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 0ae5f7331e..d2b29ba27b 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -303,7 +303,7 @@ public Q_SLOTS: /** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */ void showNormalIfMinimized() { showNormalIfMinimized(false); } void showNormalIfMinimized(bool fToggleHidden); - /** Simply calls showNormalIfMinimized(true) for use in SLOT() macro */ + /** Simply calls showNormalIfMinimized(true) */ void toggleHidden(); /** called by a timer to check if ShutdownRequested() has been set **/ diff --git a/test/lint/lint-qt.sh b/test/lint/lint-qt.sh deleted file mode 100755 index 2e77682aa2..0000000000 --- a/test/lint/lint-qt.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2018 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. -# -# Check for SIGNAL/SLOT connect style, removed since Qt4 support drop. - -export LC_ALL=C - -EXIT_CODE=0 - -OUTPUT=$(git grep -E '(SIGNAL|, ?SLOT)\(' -- src/qt) -if [[ ${OUTPUT} != "" ]]; then - echo "Use Qt5 connect style in:" - echo "$OUTPUT" - EXIT_CODE=1 -fi - -exit ${EXIT_CODE} |