d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-03 02:14:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15444 from Chocobo1/guard

Browse Source 
Prevent self-assignment in assignment operator
This commit is contained in:
Chocobo1 2021-09-12 12:56:17 +08:00 committed by GitHub
commit 6de0622c1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/bittorrent/torrentinfo.cpp
View File

@ -88,7 +88,10 @@ TorrentInfo::TorrentInfo(const TorrentInfo &other)
TorrentInfo &TorrentInfo::operator=(const TorrentInfo &other) TorrentInfo &TorrentInfo::operator=(const TorrentInfo &other)
{ {
m_nativeInfo = other.m_nativeInfo; if (this != &other)
{
m_nativeInfo = other.m_nativeInfo;
}
return *this; return *this;
} }

5
src/base/rss/rss_autodownloadrule.cpp
View File

@ -440,7 +440,10 @@ bool AutoDownloadRule::accepts(const QVariantHash &articleData)
AutoDownloadRule &AutoDownloadRule::operator=(const AutoDownloadRule &other) AutoDownloadRule &AutoDownloadRule::operator=(const AutoDownloadRule &other)
{ {
m_dataPtr = other.m_dataPtr; if (this != &other)
{
m_dataPtr = other.m_dataPtr;
}
return *this; return *this;
} }

6
src/gui/raisedmessagebox.h
View File

@ -32,7 +32,8 @@
class RaisedMessageBox final : public QMessageBox class RaisedMessageBox final : public QMessageBox
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY_MOVE(RaisedMessageBox)
public: public:
static QMessageBox::StandardButton critical(QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton defaultButton = QMessageBox::NoButton); 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: 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(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); 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);
}; };