From 23ebb3134b9395a8f460860ea8686ed4a9587642 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 13 Jul 2019 13:49:26 +0800 Subject: [PATCH] Move QLabels out of class --- src/gui/advancedsettings.cpp | 20 +++++++++++++------- src/gui/advancedsettings.h | 2 -- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp index 62fbec101..4ec7f922b 100644 --- a/src/gui/advancedsettings.cpp +++ b/src/gui/advancedsettings.cpp @@ -32,6 +32,7 @@ #include #include +#include #include #include "base/bittorrent/session.h" @@ -313,15 +314,20 @@ void AdvancedSettings::loadAdvancedSettings() const BitTorrent::Session *const session = BitTorrent::Session::instance(); // add section headers - labelQbtLink.setText(makeLink("https://github.com/qbittorrent/qBittorrent/wiki/Explanation-of-Options-in-qBittorrent#Advanced" - , tr("Open documentation"))); - labelQbtLink.setOpenExternalLinks(true); - addRow(QBITTORRENT_HEADER, QString("%1").arg(tr("qBittorrent Section")), &labelQbtLink); + auto *labelQbtLink = new QLabel( + makeLink(QLatin1String("https://github.com/qbittorrent/qBittorrent/wiki/Explanation-of-Options-in-qBittorrent#Advanced") + , tr("Open documentation")) + , this); + labelQbtLink->setOpenExternalLinks(true); + addRow(QBITTORRENT_HEADER, QString("%1").arg(tr("qBittorrent Section")), labelQbtLink); static_cast(cellWidget(QBITTORRENT_HEADER, PROPERTY))->setAlignment(Qt::AlignCenter | Qt::AlignVCenter); - labelLibtorrentLink.setText(makeLink("https://www.libtorrent.org/reference.html", tr("Open documentation"))); - labelLibtorrentLink.setOpenExternalLinks(true); - addRow(LIBTORRENT_HEADER, QString("%1").arg(tr("libtorrent Section")), &labelLibtorrentLink); + auto *labelLibtorrentLink = new QLabel( + makeLink(QLatin1String("https://www.libtorrent.org/reference.html") + , tr("Open documentation")) + , this); + labelLibtorrentLink->setOpenExternalLinks(true); + addRow(LIBTORRENT_HEADER, QString("%1").arg(tr("libtorrent Section")), labelLibtorrentLink); static_cast(cellWidget(LIBTORRENT_HEADER, PROPERTY))->setAlignment(Qt::AlignCenter | Qt::AlignVCenter); // Async IO threads diff --git a/src/gui/advancedsettings.h b/src/gui/advancedsettings.h index ebd057d7d..5d317644a 100644 --- a/src/gui/advancedsettings.h +++ b/src/gui/advancedsettings.h @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -58,7 +57,6 @@ private: void loadAdvancedSettings(); template void addRow(int row, const QString &text, T *widget); - QLabel labelQbtLink, labelLibtorrentLink; QSpinBox spinBoxAsyncIOThreads, spinBoxFilePoolSize, spinBoxCheckingMemUsage, spinBoxCache, spinBoxSaveResumeDataInterval, spinBoxOutgoingPortsMin, spinBoxOutgoingPortsMax, spinBoxListRefresh, spinBoxTrackerPort, spinBoxCacheTTL, spinBoxSendBufferWatermark, spinBoxSendBufferLowWatermark,