Merge pull request #17057 from Chocobo1/build

Disable copy, move constructors when inheriting from QObject

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -3,9 +3,9 @@
 # to consume common compile options/definitions
 
 macro(qbt_common_config)
-
     # treat value specified by the CXX_STANDARD target property as a requirement by default
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_EXTENSIONS OFF)
 
     add_library(qbt_common_cfg INTERFACE)
 
@@ -21,6 +21,7 @@ macro(qbt_common_config)
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
         QT_USE_QSTRINGBUILDER
         QT_STRICT_ITERATORS
         $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>

src/base/net/dnsupdater.h

@@ -43,6 +43,7 @@ namespace Net
     class DNSUpdater : public QObject
     {
         Q_OBJECT
+        Q_DISABLE_COPY_MOVE(DNSUpdater)
 
     public:
         explicit DNSUpdater(QObject *parent = nullptr);

src/base/net/smtp.h

@@ -50,6 +50,7 @@ namespace Net
     class Smtp : public QObject
     {
         Q_OBJECT
+        Q_DISABLE_COPY_MOVE(Smtp)
 
     public:
         Smtp(QObject *parent = nullptr);

src/base/preferences.h

@@ -94,11 +94,6 @@ class Preferences : public QObject
 
     Preferences();
 
-    static Preferences *m_instance;
-
-signals:
-    void changed();
-
 public:
     static void initInstance();
     static void freeInstance();
@@ -414,4 +409,10 @@ public slots:
     void setTrackerFilterState(bool checked);
 
     void apply();
+
+signals:
+    void changed();
+
+private:
+    static Preferences *m_instance;
 };

src/base/rss/rss_parser.h

@@ -52,6 +52,7 @@ namespace RSS
         class Parser : public QObject
         {
             Q_OBJECT
+            Q_DISABLE_COPY_MOVE(Parser)
 
         public:
             explicit Parser(QString lastBuildDate);

src/base/settingsstorage.h

@@ -53,6 +53,8 @@ struct IsQFlags<QFlags<T>> : std::true_type {};
 class SettingsStorage final : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(SettingsStorage)
+
     SettingsStorage();
     ~SettingsStorage();
 

src/gui/autoexpandabledialog.h

@@ -41,6 +41,7 @@ namespace Ui
 class AutoExpandableDialog final : public QDialog
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(AutoExpandableDialog)
 
 public:
     explicit AutoExpandableDialog(QWidget *parent);

src/gui/categoryfiltermodel.h

@@ -42,6 +42,7 @@ namespace BitTorrent
 class CategoryFilterModel final : public QAbstractItemModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CategoryFilterModel)
 
 public:
     explicit CategoryFilterModel(QObject *parent = nullptr);

src/gui/cookiesdialog.h

@@ -42,6 +42,7 @@ namespace Ui
 class CookiesDialog final : public QDialog
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CookiesDialog)
 
 public:
     explicit CookiesDialog(QWidget *parent = nullptr);

src/gui/cookiesmodel.h

@@ -35,6 +35,7 @@
 class CookiesModel final : public QAbstractItemModel
 {
      Q_OBJECT
+     Q_DISABLE_COPY_MOVE(CookiesModel)
 
 public:
     enum Column

src/gui/deletionconfirmationdialog.h

@@ -40,6 +40,7 @@ namespace Ui
 class DeletionConfirmationDialog : public QDialog
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(DeletionConfirmationDialog)
 
 public:
     DeletionConfirmationDialog(QWidget *parent, int size, const QString &name, bool defaultDeleteFiles);

src/gui/executionlogwidget.h

@@ -44,6 +44,7 @@ class LogListView;
 class ExecutionLogWidget : public QWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ExecutionLogWidget)
 
 public:
     ExecutionLogWidget(Log::MsgTypes types, QWidget *parent);

src/gui/fspathedit.h

@@ -46,11 +46,15 @@ namespace Private
 class FileSystemPathEdit : public QWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(FileSystemPathEdit)
+
     Q_PROPERTY(Mode mode READ mode WRITE setMode)
     Q_PROPERTY(Path selectedPath READ selectedPath WRITE setSelectedPath NOTIFY selectedPathChanged)
     Q_PROPERTY(QString fileNameFilter READ fileNameFilter WRITE setFileNameFilter)
     Q_PROPERTY(QString dialogCaption READ dialogCaption WRITE setDialogCaption)
 
+    class FileSystemPathEditPrivate;
+
 public:
     ~FileSystemPathEdit() override;
 
@@ -100,13 +104,13 @@ protected slots:
     void onPathEdited();
 
 private:
+    Q_DECLARE_PRIVATE(FileSystemPathEdit)
+
     virtual QString editWidgetText() const = 0;
     virtual void setEditWidgetText(const QString &text) = 0;
 
     QWidget *editWidgetImpl() const;
-    Q_DISABLE_COPY_MOVE(FileSystemPathEdit)
-    class FileSystemPathEditPrivate;
-    Q_DECLARE_PRIVATE(FileSystemPathEdit)
+
     FileSystemPathEditPrivate *d_ptr;
 };
 

src/gui/fspathedit_p.h

@@ -47,6 +47,7 @@ namespace Private
     class FileSystemPathValidator final : public QValidator
     {
         Q_OBJECT
+        Q_DISABLE_COPY_MOVE(FileSystemPathValidator)
 
     public:
         FileSystemPathValidator(QObject *parent = nullptr);
@@ -147,6 +148,7 @@ namespace Private
     class FileComboEdit final : public QComboBox, public FileEditorWithCompletion
     {
         Q_OBJECT
+        Q_DISABLE_COPY_MOVE(FileComboEdit)
 
     public:
         FileComboEdit(QWidget *parent = nullptr);

src/gui/lineedit.h

@@ -16,6 +16,7 @@ class QToolButton;
 class LineEdit final : public QLineEdit
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(LineEdit)
 
 public:
     LineEdit(QWidget *parent);

src/gui/mainwindow.h

@@ -74,6 +74,7 @@ namespace Ui
 class MainWindow final : public QMainWindow
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(MainWindow)
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);

src/gui/powermanagement/powermanagement.h

@@ -43,6 +43,7 @@ class PowerManagementInhibitor;
 class PowerManagement : public QObject
 {
   Q_OBJECT
+  Q_DISABLE_COPY_MOVE(PowerManagement)
 
 public:
   PowerManagement(QObject *parent = nullptr);

src/gui/powermanagement/powermanagement_x11.h

@@ -35,6 +35,7 @@ class QDBusPendingCallWatcher;
 class PowerManagementInhibitor : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(PowerManagementInhibitor)
 
 public:
     PowerManagementInhibitor(QObject *parent = nullptr);

src/gui/properties/peerlistwidget.h

@@ -55,6 +55,7 @@ namespace Net
 class PeerListWidget final : public QTreeView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(PeerListWidget)
 
 public:
     enum PeerListColumns

src/gui/properties/peersadditiondialog.h

@@ -41,6 +41,7 @@ namespace Ui
 class PeersAdditionDialog : public QDialog
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(PeersAdditionDialog)
 
 public:
     PeersAdditionDialog(QWidget *parent);

src/gui/properties/pieceavailabilitybar.h

@@ -32,10 +32,11 @@
 
 class PieceAvailabilityBar final : public PiecesBar
 {
-    using base = PiecesBar;
     Q_OBJECT
     Q_DISABLE_COPY_MOVE(PieceAvailabilityBar)
 
+    using base = PiecesBar;
+
 public:
     PieceAvailabilityBar(QWidget *parent);
 

src/gui/properties/piecesbar.h

@@ -42,10 +42,11 @@ namespace BitTorrent
 
 class PiecesBar : public QWidget
 {
-    using base = QWidget;
     Q_OBJECT
     Q_DISABLE_COPY_MOVE(PiecesBar)
 
+    using base = QWidget;
+
 public:
     explicit PiecesBar(QWidget *parent = nullptr);
 

src/gui/properties/speedplotview.h

@@ -48,6 +48,7 @@ using namespace std::chrono_literals;
 class SpeedPlotView final : public QGraphicsView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(SpeedPlotView)
 
 public:
     enum GraphID

src/gui/properties/speedwidget.h

@@ -42,6 +42,7 @@ class SpeedPlotView;
 class ComboBoxMenuButton final : public QComboBox
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ComboBoxMenuButton)
 
 public:
     ComboBoxMenuButton(QWidget *parent, QMenu *menu);
@@ -55,6 +56,7 @@ private:
 class SpeedWidget : public QWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(SpeedWidget)
 
 public:
     explicit SpeedWidget(PropertiesWidget *parent);

src/gui/properties/trackersadditiondialog.h

@@ -51,6 +51,7 @@ namespace Ui
 class TrackersAdditionDialog : public QDialog
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(TrackersAdditionDialog)
 
 public:
     TrackersAdditionDialog(QWidget *parent, BitTorrent::Torrent *const torrent);

src/gui/rss/articlelistwidget.h

@@ -40,6 +40,7 @@ namespace RSS
 class ArticleListWidget : public QListWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ArticleListWidget)
 
 public:
     explicit ArticleListWidget(QWidget *parent);

src/gui/rss/feedlistwidget.h

@@ -43,6 +43,7 @@ namespace RSS
 class FeedListWidget final : public QTreeWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(FeedListWidget)
 
 public:
     explicit FeedListWidget(QWidget *parent);

src/gui/rss/htmlbrowser.h

@@ -38,6 +38,7 @@ class QNetworkReply;
 class HtmlBrowser final : public QTextBrowser
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(HtmlBrowser)
 
 public:
     explicit HtmlBrowser(QWidget* parent = nullptr);

src/gui/rss/rsswidget.h

@@ -46,6 +46,7 @@ namespace Ui
 class RSSWidget : public QWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(RSSWidget)
 
 public:
     RSSWidget(QWidget *parent);

src/gui/shutdownconfirmdialog.h

@@ -41,6 +41,7 @@ namespace Ui
 class ShutdownConfirmDialog final : public QDialog
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ShutdownConfirmDialog)
 
 public:
     ShutdownConfirmDialog(QWidget *parent, const ShutdownDialogAction &action);

src/gui/tagfiltermodel.h

@@ -45,6 +45,7 @@ namespace BitTorrent
 class TagFilterModel final : public QAbstractListModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(TagFilterModel)
 
 public:
     explicit TagFilterModel(QObject *parent = nullptr);

src/gui/tagfilterwidget.h

@@ -33,6 +33,7 @@
 class TagFilterWidget final : public QTreeView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(TagFilterWidget)
 
 public:
     explicit TagFilterWidget(QWidget *parent = nullptr);

src/gui/torrentcontentfiltermodel.h

@@ -38,6 +38,7 @@ class TorrentContentModel;
 class TorrentContentFilterModel final : public QSortFilterProxyModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(TorrentContentFilterModel)
 
 public:
     TorrentContentFilterModel(QObject *parent = nullptr);

src/src.pro

@@ -61,12 +61,14 @@ CONFIG(release, debug|release) {
 include(../version.pri)
 
 # Qt defines
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050f02
-DEFINES += QT_NO_CAST_FROM_ASCII
-DEFINES += QT_NO_CAST_TO_ASCII
-DEFINES += QT_NO_CAST_FROM_BYTEARRAY
-DEFINES += QT_USE_QSTRINGBUILDER
-DEFINES += QT_STRICT_ITERATORS
+DEFINES += \
+    QT_DISABLE_DEPRECATED_BEFORE=0x050f02 \
+    QT_NO_CAST_FROM_ASCII \
+    QT_NO_CAST_TO_ASCII \
+    QT_NO_CAST_FROM_BYTEARRAY \
+    QT_NO_NARROWING_CONVERSIONS_IN_CONNECT \
+    QT_USE_QSTRINGBUILDER \
+    QT_STRICT_ITERATORS
 
 INCLUDEPATH += $$PWD