qt: merge walletstack and walletframe
There were too many levels of indirection here, and the functionality of walletframe and walletstack can easily be merged. This commit merges the two which cuts a lot of lines of boilerplate code.
This commit is contained in:
@@ -51,7 +51,7 @@ QT_MOC_CPP = moc_aboutdialog.cpp moc_addressbookpage.cpp \
|
||||
moc_signverifymessagedialog.cpp moc_splashscreen.cpp moc_trafficgraphwidget.cpp moc_transactiondesc.cpp \
|
||||
moc_transactiondescdialog.cpp moc_transactionfilterproxy.cpp \
|
||||
moc_transactiontablemodel.cpp moc_transactionview.cpp moc_walletframe.cpp \
|
||||
moc_walletmodel.cpp moc_walletstack.cpp moc_walletview.cpp
|
||||
moc_walletmodel.cpp moc_walletview.cpp
|
||||
|
||||
BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm
|
||||
QR_CPP = qrcodedialog.cpp
|
||||
@@ -75,7 +75,7 @@ BITCOIN_QT_H = aboutdialog.h addressbookpage.h addresstablemodel.h \
|
||||
sendcoinsdialog.h sendcoinsentry.h signverifymessagedialog.h splashscreen.h \
|
||||
trafficgraphwidget.h transactiondescdialog.h transactiondesc.h transactionfilterproxy.h \
|
||||
transactionrecord.h transactiontablemodel.h transactionview.h walletframe.h \
|
||||
walletmodel.h walletmodeltransaction.h walletstack.h walletview.h
|
||||
walletmodel.h walletmodeltransaction.h walletview.h
|
||||
|
||||
RES_ICONS = res/icons/bitcoin.png res/icons/address-book.png \
|
||||
res/icons/quit.png res/icons/send.png res/icons/toolbar.png \
|
||||
@@ -105,7 +105,7 @@ BITCOIN_QT_CPP = aboutdialog.cpp addressbookpage.cpp \
|
||||
signverifymessagedialog.cpp splashscreen.cpp trafficgraphwidget.cpp transactiondesc.cpp \
|
||||
transactiondescdialog.cpp transactionfilterproxy.cpp transactionrecord.cpp \
|
||||
transactiontablemodel.cpp transactionview.cpp walletframe.cpp \
|
||||
walletmodel.cpp walletmodeltransaction.cpp walletstack.cpp walletview.cpp
|
||||
walletmodel.cpp walletmodeltransaction.cpp walletview.cpp
|
||||
|
||||
RES_IMAGES = res/images/about.png res/images/splash.png \
|
||||
res/images/splash_testnet.png
|
||||
|
||||
Reference in New Issue
Block a user