Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-22 19:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up accidental changes to make PR cleaner

Browse source
This commit is contained in:
twiddle 2024-10-14 13:14:41 -04:00
parent 7ec47fd929
commit 4b5800f0e5
7 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -28,7 +28,7 @@ option(DONATE_BEG "Prompt donation window every once in a while" OFF)
option(WITH_SCANNER "Enable webcam QR scanner" OFF) option(WITH_SCANNER "Enable webcam QR scanner" OFF)
option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF) option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF)
# # Plugins
option(WITH_PLUGIN_HOME "Include Home tab plugin" ON) option(WITH_PLUGIN_HOME "Include Home tab plugin" ON)
option(WITH_PLUGIN_TICKERS "Include Tickers Home plugin" ON) option(WITH_PLUGIN_TICKERS "Include Tickers Home plugin" ON)
option(WITH_PLUGIN_CROWDFUNDING "Include Crowdfunding Home plugin" ON) option(WITH_PLUGIN_CROWDFUNDING "Include Crowdfunding Home plugin" ON)
@ -115,7 +115,6 @@ endif()
# libzip # libzip
if(CHECK_UPDATES OR WITH_PLUGIN_ATOMIC) if(CHECK_UPDATES OR WITH_PLUGIN_ATOMIC)
set(ZLIB_USE_STATIC_LIBS "ON") set(ZLIB_USE_STATIC_LIBS "ON")
message("libzip inclueded")
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_path(LIBZIP_INCLUDE_DIRS zip.h) find_path(LIBZIP_INCLUDE_DIRS zip.h)
find_library(LIBZIP_LIBRARIES zip) find_library(LIBZIP_LIBRARIES zip)

5
contrib/depends/packages/packages.mk
View file

@ -1,12 +1,12 @@
packages := boost openssl unbound qrencode libsodium polyseed hidapi abseil protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp libarchive packages := boost openssl unbound qrencode libsodium polyseed hidapi abseil protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp libarchive
native_packages := native_qt native_abseil native_protobuf native_packages := native_qt native_abseil native_protobuf
linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime
linux_native_packages = linux_native_packages =
x86_64_linux_packages := flatstart x86_64_linux_packages := flatstart
darwin_packages := darwin_packages :=
darwin_native_packages = darwin_sdk native_cctools native_libtapi darwin_native_packages = darwin_sdk native_cctools native_libtapi
mingw32_packages = mingw32_packages =
@ -18,4 +18,3 @@ qt_mingw32_packages := qt
tor_linux_packages := libevent tor_linux tor_linux_packages := libevent tor_linux
tor_darwin_packages := tor_darwin tor_darwin_packages := tor_darwin
tor_mingw32_packages := tor_mingw32

1
src/MainWindow.cpp
View file

@ -70,7 +70,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
this->restoreGeo(); this->restoreGeo();
this->initStatusBar(); this->initStatusBar();
this->initPlugins(); this->initPlugins();
this->initWidgets(); this->initWidgets();
this->initMenu(); this->initMenu();

2
src/ReceiveWidget.cpp
View file

@ -246,7 +246,7 @@ void ReceiveWidget::updateQrCode(){
void ReceiveWidget::showQrCodeDialog() { void ReceiveWidget::showQrCodeDialog() {
SubaddressRow* row = this->currentEntry(); SubaddressRow* row = this->currentEntry();
if (!row) return;
QString address = this->getAddress(row->getRow()); QString address = this->getAddress(row->getRow());
QrCode qr(address, QrCode::Version::AUTO, QrCode::ErrorCorrectionLevel::HIGH); QrCode qr(address, QrCode::Version::AUTO, QrCode::ErrorCorrectionLevel::HIGH);
QrCodeDialog dialog{this, &qr, "Address"}; QrCodeDialog dialog{this, &qr, "Address"};

2
src/utils/config.h
View file

@ -11,8 +11,6 @@
#include <QPointer> #include <QPointer>
#include <QDir> #include <QDir>
class Config : public QObject class Config : public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/wizard/WalletWizard.cpp
View file

@ -38,8 +38,6 @@ WalletWizard::WalletWizard(QWidget *parent)
auto networkWebsocketPage = new PageNetworkWebsocket(this); auto networkWebsocketPage = new PageNetworkWebsocket(this);
auto menuPage = new PageMenu(&m_wizardFields, m_walletKeysFilesModel, this); auto menuPage = new PageMenu(&m_wizardFields, m_walletKeysFilesModel, this);
auto openWalletPage = new PageOpenWallet(m_walletKeysFilesModel, this); auto openWalletPage = new PageOpenWallet(m_walletKeysFilesModel, this);
auto createWallet = new PageWalletFile(&m_wizardFields , this); auto createWallet = new PageWalletFile(&m_wizardFields , this);
auto createWalletSeed = new PageWalletSeed(&m_wizardFields, this); auto createWalletSeed = new PageWalletSeed(&m_wizardFields, this);
auto walletSetPasswordPage = new PageSetPassword(&m_wizardFields, this); auto walletSetPasswordPage = new PageSetPassword(&m_wizardFields, this);

3
src/wizard/WalletWizard.h
View file

@ -82,8 +82,7 @@ public:
Page_HardwareDevice, Page_HardwareDevice,
Page_NetworkProxy, Page_NetworkProxy,
Page_NetworkWebsocket, Page_NetworkWebsocket,
Page_Plugins, Page_Plugins
Page_Atomic
}; };
explicit WalletWizard(QWidget *parent = nullptr); explicit WalletWizard(QWidget *parent = nullptr);