mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-02-03 02:14:16 +00:00
Merge pull request #15444 from Chocobo1/guard
Prevent self-assignment in assignment operator
This commit is contained in:
commit
6de0622c1a
@ -88,7 +88,10 @@ TorrentInfo::TorrentInfo(const TorrentInfo &other)
|
||||
|
||||
TorrentInfo &TorrentInfo::operator=(const TorrentInfo &other)
|
||||
{
|
||||
m_nativeInfo = other.m_nativeInfo;
|
||||
if (this != &other)
|
||||
{
|
||||
m_nativeInfo = other.m_nativeInfo;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
@ -440,7 +440,10 @@ bool AutoDownloadRule::accepts(const QVariantHash &articleData)
|
||||
|
||||
AutoDownloadRule &AutoDownloadRule::operator=(const AutoDownloadRule &other)
|
||||
{
|
||||
m_dataPtr = other.m_dataPtr;
|
||||
if (this != &other)
|
||||
{
|
||||
m_dataPtr = other.m_dataPtr;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,8 @@
|
||||
|
||||
class RaisedMessageBox final : public QMessageBox
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY_MOVE(RaisedMessageBox)
|
||||
|
||||
public:
|
||||
static QMessageBox::StandardButton critical(QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
|
||||
@ -45,9 +46,6 @@ protected:
|
||||
|
||||
private:
|
||||
RaisedMessageBox(QMessageBox::Icon icon, const QString &title, const QString &text, QMessageBox::StandardButtons buttons = NoButton, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Dialog|Qt::MSWindowsFixedSizeDialogHint);
|
||||
RaisedMessageBox();
|
||||
RaisedMessageBox(RaisedMessageBox const&);
|
||||
void operator=(RaisedMessageBox const&);
|
||||
|
||||
static QMessageBox::StandardButton impl(const QMessageBox::Icon &icon, QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user