diff options
| author | Russell Yanofsky <[email protected]> | 2018-04-07 03:42:02 -0400 |
|---|---|---|
| committer | Russell Yanofsky <[email protected]> | 2018-04-07 03:42:02 -0400 |
| commit | 17780d6f35a3951f649c3b7766b9283d9c18e39f (patch) | |
| tree | c858c2d92b028d96118983415f40da5b3a0c48e6 /src/qt/optionsmodel.h | |
| parent | Merge #10244: Refactor: separate gui from wallet and node (diff) | |
| download | discoin-17780d6f35a3951f649c3b7766b9283d9c18e39f.tar.xz discoin-17780d6f35a3951f649c3b7766b9283d9c18e39f.zip | |
scripted-diff: Avoid `interface` keyword to fix windows gitian build
Rename `interface` to `interfaces`
Build failure reported by Chun Kuan Lee <[email protected]>
https://github.com/bitcoin/bitcoin/pull/10244#issuecomment-379434756
-BEGIN VERIFY SCRIPT-
git mv src/interface src/interfaces
ren() { git grep -l "$1" | xargs sed -i "s,$1,$2,g"; }
ren interface/ interfaces/
ren interface:: interfaces::
ren BITCOIN_INTERFACE_ BITCOIN_INTERFACES_
ren "namespace interface" "namespace interfaces"
-END VERIFY SCRIPT-
Diffstat (limited to 'src/qt/optionsmodel.h')
| -rw-r--r-- | src/qt/optionsmodel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 96c6b8fa4..fc1d119a7 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -9,7 +9,7 @@ #include <QAbstractListModel> -namespace interface { +namespace interfaces { class Node; } @@ -31,7 +31,7 @@ class OptionsModel : public QAbstractListModel Q_OBJECT public: - explicit OptionsModel(interface::Node& node, QObject *parent = 0, bool resetSettings = false); + explicit OptionsModel(interfaces::Node& node, QObject *parent = 0, bool resetSettings = false); enum OptionID { StartAtStartup, // bool @@ -79,10 +79,10 @@ public: void setRestartRequired(bool fRequired); bool isRestartRequired() const; - interface::Node& node() const { return m_node; } + interfaces::Node& node() const { return m_node; } private: - interface::Node& m_node; + interfaces::Node& m_node; /* Qt-only settings */ bool fHideTrayIcon; bool fMinimizeToTray; |