aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bitcoinrpc.cpp (renamed from src/rpc.cpp)0
-rw-r--r--src/bitcoinrpc.h (renamed from src/rpc.h)0
-rw-r--r--src/init.cpp2
-rw-r--r--src/qt/bitcoin.cpp31
-rw-r--r--src/qt/forms/addressbookdialog.ui26
-rw-r--r--src/qt/guiutil.cpp3
-rw-r--r--src/qt/transactiondesc.cpp3
7 files changed, 35 insertions, 30 deletions
diff --git a/src/rpc.cpp b/src/bitcoinrpc.cpp
index 644ad92297..644ad92297 100644
--- a/src/rpc.cpp
+++ b/src/bitcoinrpc.cpp
diff --git a/src/rpc.h b/src/bitcoinrpc.h
index 48a7b8a8a6..48a7b8a8a6 100644
--- a/src/rpc.h
+++ b/src/bitcoinrpc.h
diff --git a/src/init.cpp b/src/init.cpp
index e4605a2b42..cac921e2b2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -3,7 +3,7 @@
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "db.h"
-#include "rpc.h"
+#include "bitcoinrpc.h"
#include "net.h"
#include "init.h"
#include "strlcpy.h"
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 397af5fd38..78a20c51c0 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -113,21 +113,23 @@ int main(int argc, char *argv[])
{
if(AppInit2(argc, argv))
{
- BitcoinGUI window;
- ClientModel clientModel(pwalletMain);
- WalletModel walletModel(pwalletMain);
- guiref = &window;
- window.setClientModel(&clientModel);
- window.setWalletModel(&walletModel);
-
- window.show();
-
- int retval = app.exec();
-
- guiref = 0;
+ {
+ // Put this in a block, so that BitcoinGUI is cleaned up properly before
+ // calling shutdown.
+ BitcoinGUI window;
+ ClientModel clientModel(pwalletMain);
+ WalletModel walletModel(pwalletMain);
+ guiref = &window;
+ window.setClientModel(&clientModel);
+ window.setWalletModel(&walletModel);
+
+ window.show();
+
+ app.exec();
+
+ guiref = 0;
+ }
Shutdown(NULL);
-
- return retval;
}
else
{
@@ -138,4 +140,5 @@ int main(int argc, char *argv[])
} catch (...) {
PrintException(NULL, "Runaway exception");
}
+ return 0;
}
diff --git a/src/qt/forms/addressbookdialog.ui b/src/qt/forms/addressbookdialog.ui
index 12ecb13651..66f1076afb 100644
--- a/src/qt/forms/addressbookdialog.ui
+++ b/src/qt/forms/addressbookdialog.ui
@@ -101,19 +101,6 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
<widget class="QPushButton" name="newAddressButton">
<property name="toolTip">
<string>Create a new address</string>
@@ -156,6 +143,19 @@
</widget>
</item>
<item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index c68532b87c..31b28024df 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -1,6 +1,7 @@
#include "guiutil.h"
#include "bitcoinaddressvalidator.h"
-#include "util.h"
+
+#include "headers.h"
#include <QString>
#include <QDateTime>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index bb2537a479..809e473060 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -1,7 +1,8 @@
#include <transactiondesc.h>
#include "guiutil.h"
-#include "main.h"
+
+#include "headers.h"
#include "qtui.h"
#include <QString>