Merge pull request #2526 from Diapolo/Qt_misc

Bitcoin-Qt: misc small changes

diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp
index 57818b8a27e92f3cd85d41d82998a1a4101357b5..cea8e984259ee45c9232550aed882a8ae6d9bf12 100644 (file)
--- 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(" © ") + tr("2009-%1 The Bitcoin developers").arg(COPYRIGHT_YEAR));
+    ui->copyrightLabel->setText(tr("Copyright") + QString(" © 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 a7b026e789f321aeb984a33eac1d3ddd25992e37..25448ea8cfba5d61ea8401cc1d90cd49872d0e4d 100644 (file)
--- 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 e2eefab3cce3a2e275628f5289d8bf780497bdef..71db587e042587f05ea80699d04d235ae337ec91 100644 (file)
--- 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 528c93bdc1e0ed35d17ad80b7f3061f7ec5ecfab..ad2d682b7bb644b90ba894dbb684ed377ddba1e4 100644 (file)
--- 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);