diff --git a/src/libs/sidebar/container.h b/src/libs/sidebar/container.h index 73a56e1..cd39443 100644 --- a/src/libs/sidebar/container.h +++ b/src/libs/sidebar/container.h @@ -36,19 +36,14 @@ class View; class Container : public QWidget { Q_OBJECT + Q_DISABLE_COPY(Container) public: explicit Container(QWidget *parent = nullptr); ~Container() override; void addView(View *view); -public slots: - -signals: - private: - Q_DISABLE_COPY(Container) - QSplitter *m_splitter = nullptr; QList m_views; diff --git a/src/libs/sidebar/proxyview.h b/src/libs/sidebar/proxyview.h index 85b714b..536d5c1 100644 --- a/src/libs/sidebar/proxyview.h +++ b/src/libs/sidebar/proxyview.h @@ -33,13 +33,12 @@ class ViewProvider; class ProxyView final : public View { Q_OBJECT + Q_DISABLE_COPY(ProxyView) public: explicit ProxyView(ViewProvider *provider, QString id = QString(), QWidget *parent = nullptr); ~ProxyView() override; private: - Q_DISABLE_COPY(ProxyView) - void clearCurrentView(); ViewProvider *m_viewProvider = nullptr; diff --git a/src/libs/sidebar/view.h b/src/libs/sidebar/view.h index d94771f..892a9de 100644 --- a/src/libs/sidebar/view.h +++ b/src/libs/sidebar/view.h @@ -31,11 +31,9 @@ namespace Sidebar { class View : public QWidget { Q_OBJECT + Q_DISABLE_COPY(View) public: explicit View(QWidget *parent = nullptr); - -private: - Q_DISABLE_COPY(View) }; } // namespace Sidebar diff --git a/src/libs/sidebar/viewprovider.h b/src/libs/sidebar/viewprovider.h index cdc7f0f..1bff697 100644 --- a/src/libs/sidebar/viewprovider.h +++ b/src/libs/sidebar/viewprovider.h @@ -33,6 +33,7 @@ class View; class ViewProvider : public QObject { Q_OBJECT + Q_DISABLE_COPY(ViewProvider) public: explicit ViewProvider(QObject *parent = nullptr); @@ -40,9 +41,6 @@ public: signals: void viewChanged(); - -private: - Q_DISABLE_COPY(ViewProvider) }; } // namespace Sidebar diff --git a/src/libs/ui/browsertab.h b/src/libs/ui/browsertab.h index 35adf92..540af04 100644 --- a/src/libs/ui/browsertab.h +++ b/src/libs/ui/browsertab.h @@ -47,6 +47,7 @@ class SearchSidebar; class BrowserTab : public QWidget { Q_OBJECT + Q_DISABLE_COPY(BrowserTab) public: explicit BrowserTab(QWidget *parent = nullptr); BrowserTab *clone(QWidget *parent = nullptr) const; @@ -64,7 +65,6 @@ signals: void titleChanged(const QString &title); private: - Q_DISABLE_COPY(BrowserTab) QIcon docsetIcon(const QUrl &url) const; // Widgets. diff --git a/src/libs/ui/searchsidebar.h b/src/libs/ui/searchsidebar.h index 1be802c..0ef4fe9 100644 --- a/src/libs/ui/searchsidebar.h +++ b/src/libs/ui/searchsidebar.h @@ -48,6 +48,7 @@ class SearchEdit; class SearchSidebar final : public Sidebar::View { Q_OBJECT + Q_DISABLE_COPY(SearchSidebar) public: explicit SearchSidebar(QWidget *parent = nullptr); SearchSidebar *clone(QWidget *parent = nullptr) const; @@ -73,7 +74,6 @@ protected: void showEvent(QShowEvent *event) override; private: - Q_DISABLE_COPY(SearchSidebar) explicit SearchSidebar(const SearchSidebar *other, QWidget *parent = nullptr); void setTreeViewModel(QAbstractItemModel *model, bool isRootDecorated); diff --git a/src/libs/ui/sidebarviewprovider.h b/src/libs/ui/sidebarviewprovider.h index 3bf24cf..7c15f46 100644 --- a/src/libs/ui/sidebarviewprovider.h +++ b/src/libs/ui/sidebarviewprovider.h @@ -33,14 +33,13 @@ class MainWindow; class SidebarViewProvider : public Sidebar::ViewProvider { Q_OBJECT + Q_DISABLE_COPY(SidebarViewProvider) public: explicit SidebarViewProvider(MainWindow *mainWindow); Sidebar::View *view(const QString &id = QString()) const override; private: - Q_DISABLE_COPY(SidebarViewProvider) - MainWindow *m_mainWindow = nullptr; };