Clean up code

Add const.
Move template implementation to .cpp file.
This commit is contained in:
Chocobo1 2022-05-14 14:39:28 +08:00
parent 538c88ced4
commit 114c6d36d1
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
4 changed files with 26 additions and 23 deletions

View file

@ -516,3 +516,22 @@ QVariant GeoIPDatabase::readArrayValue(quint32 &offset, const quint32 count) con
return array; return array;
} }
template <typename T>
QVariant GeoIPDatabase::readPlainValue(quint32 &offset, const quint8 len) const
{
T value = 0;
const uchar *const data = m_data + offset;
const quint32 availSize = m_size - offset;
if ((len > 0) && (len <= sizeof(T) && (availSize >= len)))
{
// copy input data to last 'len' bytes of 'value'
uchar *dst = reinterpret_cast<uchar *>(&value) + (sizeof(T) - len);
memcpy(dst, data, len);
fromBigEndian(reinterpret_cast<uchar *>(&value), sizeof(T));
offset += len;
}
return QVariant::fromValue(value);
}

View file

@ -70,24 +70,7 @@ private:
QVariant readMapValue(quint32 &offset, quint32 count) const; QVariant readMapValue(quint32 &offset, quint32 count) const;
QVariant readArrayValue(quint32 &offset, quint32 count) const; QVariant readArrayValue(quint32 &offset, quint32 count) const;
template<typename T> template <typename T> QVariant readPlainValue(quint32 &offset, quint8 len) const;
QVariant readPlainValue(quint32 &offset, quint8 len) const
{
T value = 0;
const uchar *const data = m_data + offset;
const quint32 availSize = m_size - offset;
if ((len > 0) && (len <= sizeof(T) && (availSize >= len)))
{
// copy input data to last 'len' bytes of 'value'
uchar *dst = reinterpret_cast<uchar *>(&value) + (sizeof(T) - len);
memcpy(dst, data, len);
fromBigEndian(reinterpret_cast<uchar *>(&value), sizeof(T));
offset += len;
}
return QVariant::fromValue(value);
}
// Metadata // Metadata
quint16 m_ipVersion; quint16 m_ipVersion;

View file

@ -156,7 +156,7 @@ AdvancedSettings::AdvancedSettings(QWidget *parent)
{ {
// column // column
setColumnCount(COL_COUNT); setColumnCount(COL_COUNT);
QStringList header = {tr("Setting"), tr("Value", "Value set for this setting")}; const QStringList header = {tr("Setting"), tr("Value", "Value set for this setting")};
setHorizontalHeaderLabels(header); setHorizontalHeaderLabels(header);
// row // row
setRowCount(ROW_COUNT); setRowCount(ROW_COUNT);
@ -171,7 +171,7 @@ AdvancedSettings::AdvancedSettings(QWidget *parent)
horizontalHeader()->setStretchLastSection(true); horizontalHeader()->setStretchLastSection(true);
} }
void AdvancedSettings::saveAdvancedSettings() void AdvancedSettings::saveAdvancedSettings() const
{ {
Preferences *const pref = Preferences::instance(); Preferences *const pref = Preferences::instance();
BitTorrent::Session *const session = BitTorrent::Session::instance(); BitTorrent::Session *const session = BitTorrent::Session::instance();
@ -314,7 +314,7 @@ void AdvancedSettings::saveAdvancedSettings()
} }
#ifndef QBT_USES_LIBTORRENT2 #ifndef QBT_USES_LIBTORRENT2
void AdvancedSettings::updateCacheSpinSuffix(int value) void AdvancedSettings::updateCacheSpinSuffix(const int value)
{ {
if (value == 0) if (value == 0)
m_spinBoxCache.setSuffix(tr(" (disabled)")); m_spinBoxCache.setSuffix(tr(" (disabled)"));

View file

@ -34,15 +34,16 @@
#include <QSpinBox> #include <QSpinBox>
#include <QTableWidget> #include <QTableWidget>
class AdvancedSettings : public QTableWidget class AdvancedSettings final : public QTableWidget
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY_MOVE(AdvancedSettings)
public: public:
AdvancedSettings(QWidget *parent); AdvancedSettings(QWidget *parent);
public slots: public slots:
void saveAdvancedSettings(); void saveAdvancedSettings() const;
signals: signals:
void settingsChanged(); void settingsChanged();