diff options
| author | Tannin <devnull@localhost> | 2015-03-09 12:34:34 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2015-03-09 12:34:34 +0100 |
| commit | 7a1ae9b0f1560c9eda32e032796fbb3fd56ff236 (patch) | |
| tree | dea71435ac1042cb008fcd9f7b1ec57e6ea91227 /src/motddialog.cpp | |
| parent | d45ebf134819e1559718681becca9c4139fb7151 (diff) | |
| parent | db2954e8eb41da715b9e7d79a72e225797401413 (diff) | |
Merge with branch1.2
Diffstat (limited to 'src/motddialog.cpp')
| -rw-r--r-- | src/motddialog.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/motddialog.cpp b/src/motddialog.cpp index 9fa2f005..96d88542 100644 --- a/src/motddialog.cpp +++ b/src/motddialog.cpp @@ -28,8 +28,6 @@ MotDDialog::MotDDialog(const QString &message, QWidget *parent) {
ui->setupUi(this);
ui->motdView->setHtml(BBCode::convertToHTML(message));
-// ui->motdView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
-// connect(ui->motdView->page(), SIGNAL(linkClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
connect(ui->motdView, SIGNAL(anchorClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
}
@@ -45,5 +43,5 @@ void MotDDialog::on_okButton_clicked() void MotDDialog::linkClicked(const QUrl &url)
{
- ::ShellExecuteW(NULL, L"open", MOBase::ToWString(url.toString()).c_str(), NULL, NULL, SW_SHOWNORMAL);
+ ::ShellExecuteW(nullptr, L"open", MOBase::ToWString(url.toString()).c_str(), nullptr, nullptr, SW_SHOWNORMAL);
}
|