highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 15:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[qt] remove unused parameter from getWarnings()

Browse Source
This commit is contained in:
John Newbery
2019-12-15 12:34:03 -03:00
parent a595011f5a
commit 869b6314fd
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/node.cpp
View File

@@ -68,7 +68,7 @@ public:
std::string getNetwork() override { return Params().NetworkIDString(); } std::string getNetwork() override { return Params().NetworkIDString(); }
void initLogging() override { InitLogging(); } void initLogging() override { InitLogging(); }
void initParameterInteraction() override { InitParameterInteraction(); } void initParameterInteraction() override { InitParameterInteraction(); }
std::string getWarnings(const std::string& type) override { return GetWarnings(type); } std::string getWarnings() override { return GetWarnings("gui"); }
uint32_t getLogCategories() override { return LogInstance().GetCategoryMask(); } uint32_t getLogCategories() override { return LogInstance().GetCategoryMask(); }
bool baseInitialize() override bool baseInitialize() override
{ {

2
src/interfaces/node.h
View File

@@ -78,7 +78,7 @@ public:
virtual void initParameterInteraction() = 0; virtual void initParameterInteraction() = 0;
//! Get warnings. //! Get warnings.
virtual std::string getWarnings(const std::string& type) = 0; virtual std::string getWarnings() = 0;
// Get log flags. // Get log flags.
virtual uint32_t getLogCategories() = 0; virtual uint32_t getLogCategories() = 0;

6
src/qt/bitcoin.cpp
View File

@@ -135,7 +135,7 @@ BitcoinCore::BitcoinCore(interfaces::Node& node) :
void BitcoinCore::handleRunawayException(const std::exception *e) void BitcoinCore::handleRunawayException(const std::exception *e)
{ {
PrintExceptionContinue(e, "Runaway exception"); PrintExceptionContinue(e, "Runaway exception");
Q_EMIT runawayException(QString::fromStdString(m_node.getWarnings("gui"))); Q_EMIT runawayException(QString::fromStdString(m_node.getWarnings()));
} }
void BitcoinCore::initialize() void BitcoinCore::initialize()
@@ -589,10 +589,10 @@ int GuiMain(int argc, char* argv[])
} }
} catch (const std::exception& e) { } catch (const std::exception& e) {
PrintExceptionContinue(&e, "Runaway exception"); PrintExceptionContinue(&e, "Runaway exception");
app.handleRunawayException(QString::fromStdString(node->getWarnings("gui"))); app.handleRunawayException(QString::fromStdString(node->getWarnings()));
} catch (...) { } catch (...) {
PrintExceptionContinue(nullptr, "Runaway exception"); PrintExceptionContinue(nullptr, "Runaway exception");
app.handleRunawayException(QString::fromStdString(node->getWarnings("gui"))); app.handleRunawayException(QString::fromStdString(node->getWarnings()));
} }
return rv; return rv;
} }

2
src/qt/clientmodel.cpp
View File

@@ -134,7 +134,7 @@ enum BlockSource ClientModel::getBlockSource() const
QString ClientModel::getStatusBarWarnings() const QString ClientModel::getStatusBarWarnings() const
{ {
return QString::fromStdString(m_node.getWarnings("gui")); return QString::fromStdString(m_node.getWarnings());
} }
OptionsModel *ClientModel::getOptionsModel() OptionsModel *ClientModel::getOptionsModel()