aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-04-23 09:27:30 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2013-04-23 09:27:30 -0700
commitaf10e3f6ac26a1ece7950f5263864c94049bf89d (patch)
tree5328158c26c9d2c7c5147ebe29e6698ab18a2607 /src
parente9d769d143ae84306ee2a89b24cc253af582dc94 (diff)
parent41fdc1cad1777aeb4569c49a72d28b6a3b099093 (diff)
Merge pull request #2526 from Diapolo/Qt_misc
Bitcoin-Qt: misc small changes
Diffstat (limited to 'src')
-rw-r--r--src/qt/aboutdialog.cpp2
-rw-r--r--src/qt/bitcoin.cpp9
-rw-r--r--src/qt/bitcoingui.cpp2
-rw-r--r--src/qt/overviewpage.cpp5
4 files changed, 8 insertions, 10 deletions
diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp
index 57818b8a27..cea8e98425 100644
--- a/src/qt/aboutdialog.cpp
+++ b/src/qt/aboutdialog.cpp
@@ -11,7 +11,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->setupUi(this);
// Set current copyright year
- ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; ") + tr("2009-%1 The Bitcoin developers").arg(COPYRIGHT_YEAR));
+ ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers"));
}
void AboutDialog::setModel(ClientModel *model)
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index a7b026e789..25448ea8cf 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -146,12 +146,12 @@ int main(int argc, char *argv[])
// Application identification (must be set before OptionsModel is initialized,
// as it is used to locate QSettings)
- app.setOrganizationName("Bitcoin");
- app.setOrganizationDomain("bitcoin.org");
+ QApplication::setOrganizationName("Bitcoin");
+ QApplication::setOrganizationDomain("bitcoin.org");
if(GetBoolArg("-testnet")) // Separate UI settings for testnet
- app.setApplicationName("Bitcoin-Qt-testnet");
+ QApplication::setApplicationName("Bitcoin-Qt-testnet");
else
- app.setApplicationName("Bitcoin-Qt");
+ QApplication::setApplicationName("Bitcoin-Qt");
// ... then GUI settings:
OptionsModel optionsModel;
@@ -207,7 +207,6 @@ int main(int argc, char *argv[])
}
app.processEvents();
-
app.setQuitOnLastWindowClosed(false);
try
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index e2eefab3cc..71db587e04 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -42,8 +42,6 @@
#include <QStackedWidget>
#include <QDateTime>
#include <QMovie>
-#include <QFileDialog>
-#include <QDesktopServices>
#include <QTimer>
#include <QDragEnterEvent>
#include <QUrl>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 528c93bdc1..ad2d682b7b 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -46,9 +46,10 @@ public:
bool confirmed = index.data(TransactionTableModel::ConfirmedRole).toBool();
QVariant value = index.data(Qt::ForegroundRole);
QColor foreground = option.palette.color(QPalette::Text);
- if(qVariantCanConvert<QColor>(value))
+ if(value.canConvert<QBrush>())
{
- foreground = qvariant_cast<QColor>(value);
+ QBrush brush = qvariant_cast<QBrush>(value);
+ foreground = brush.color();
}
painter->setPen(foreground);