Skip to content

Commit af6e093

Browse files
committed
Merge pull request #3268
79fac3f [Qt] use GUIUtil::setClipboard() where possible (Philip Kaufmann)
2 parents 3443ade + 79fac3f commit af6e093

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

src/qt/guiutil.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,8 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
221221

222222
if(!selection.isEmpty())
223223
{
224-
// Copy first item (global clipboard)
225-
QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Clipboard);
226-
// Copy first item (global mouse selection for e.g. X11 - NOP on Windows)
227-
QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Selection);
224+
// Copy first item
225+
setClipboard(selection.at(0).data(role).toString());
228226
}
229227
}
230228

src/qt/receiverequestdialog.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
#include "optionsmodel.h"
1212
#include "walletmodel.h"
1313

14-
#include <QPixmap>
1514
#include <QClipboard>
16-
#include <QMouseEvent>
1715
#include <QDrag>
1816
#include <QMimeData>
17+
#include <QMouseEvent>
18+
#include <QPixmap>
1919
#if QT_VERSION < 0x050000
2020
#include <QUrl>
2121
#endif
@@ -177,13 +177,10 @@ void ReceiveRequestDialog::update()
177177

178178
void ReceiveRequestDialog::on_btnCopyURI_clicked()
179179
{
180-
QString uri = GUIUtil::formatBitcoinURI(info);
181-
QApplication::clipboard()->setText(uri, QClipboard::Clipboard);
182-
QApplication::clipboard()->setText(uri, QClipboard::Selection);
180+
GUIUtil::setClipboard(GUIUtil::formatBitcoinURI(info));
183181
}
184182

185183
void ReceiveRequestDialog::on_btnCopyAddress_clicked()
186184
{
187-
QApplication::clipboard()->setText(info.address, QClipboard::Clipboard);
188-
QApplication::clipboard()->setText(info.address, QClipboard::Selection);
185+
GUIUtil::setClipboard(info.address);
189186
}

src/qt/signverifymessagedialog.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
2525
{
2626
ui->setupUi(this);
2727

28-
#if (QT_VERSION >= 0x040700)
29-
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
28+
#if QT_VERSION >= 0x040700
3029
ui->addressIn_SM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
3130
ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature"));
3231

@@ -73,7 +72,6 @@ void SignVerifyMessageDialog::setAddress_VM(const QString &address)
7372
void SignVerifyMessageDialog::showTab_SM(bool fShow)
7473
{
7574
ui->tabWidget->setCurrentIndex(0);
76-
7775
if (fShow)
7876
this->show();
7977
}
@@ -164,7 +162,7 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
164162

165163
void SignVerifyMessageDialog::on_copySignatureButton_SM_clicked()
166164
{
167-
QApplication::clipboard()->setText(ui->signatureOut_SM->text());
165+
GUIUtil::setClipboard(ui->signatureOut_SM->text());
168166
}
169167

170168
void SignVerifyMessageDialog::on_clearButton_SM_clicked()

0 commit comments

Comments
 (0)